Add newer coloursHEADmain

18 files changed, 3069 insertions, 9 deletions

diff --git a/colors/base16-brushtrees-dark.lua b/colors/base16-brushtrees-dark.lua
index 15d70cf..8f54164 100644
--- a/colors/base16-brushtrees-dark.lua
+++ b/colors/base16-brushtrees-dark.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Brush Trees Dark scheme by Abraham White <abelincoln.white@gmail.com>
+-- Brush Trees Dark scheme by Abraham White &lt;abelincoln.white@gmail.com&gt;
 
 local gui00 = "485867"
 local gui01 = "5A6D7A"
diff --git a/colors/base16-brushtrees.lua b/colors/base16-brushtrees.lua
index bd2e413..528007e 100644
--- a/colors/base16-brushtrees.lua
+++ b/colors/base16-brushtrees.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Brush Trees scheme by Abraham White <abelincoln.white@gmail.com>
+-- Brush Trees scheme by Abraham White &lt;abelincoln.white@gmail.com&gt;
 
 local gui00 = "E3EFEF"
 local gui01 = "C9DBDC"
diff --git a/colors/base16-horizon-terminal-dark.lua b/colors/base16-horizon-terminal-dark.lua
index b769c5d..19dffdd 100644
--- a/colors/base16-horizon-terminal-dark.lua
+++ b/colors/base16-horizon-terminal-dark.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Horizon Dark scheme by Michaël Ball (http://github.com/michael-ball/)
+-- Horizon Terminal Dark scheme by Michaël Ball (http://github.com/michael-ball/)
 
 local gui00 = "1C1E26"
 local gui01 = "232530"
diff --git a/colors/base16-horizon-terminal-light.lua b/colors/base16-horizon-terminal-light.lua
index 641f09e..d8ccff6 100644
--- a/colors/base16-horizon-terminal-light.lua
+++ b/colors/base16-horizon-terminal-light.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Horizon Light scheme by Michaël Ball (http://github.com/michael-ball/)
+-- Horizon Terminal Light scheme by Michaël Ball (http://github.com/michael-ball/)
 
 local gui00 = "FDF0ED"
 local gui01 = "FADAD1"
diff --git a/colors/base16-rose-pine-dawn.lua b/colors/base16-rose-pine-dawn.lua
index b40e354..29663b0 100644
--- a/colors/base16-rose-pine-dawn.lua
+++ b/colors/base16-rose-pine-dawn.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Rosé Pine Dawn scheme by Emilia Dunfelt <sayhi@dunfelt.se>
+-- Rosé Pine Dawn scheme by Emilia Dunfelt &lt;sayhi@dunfelt.se&gt;
 
 local gui00 = "faf4ed"
 local gui01 = "fffaf3"
diff --git a/colors/base16-rose-pine-moon.lua b/colors/base16-rose-pine-moon.lua
index 0c81e6f..fad65b6 100644
--- a/colors/base16-rose-pine-moon.lua
+++ b/colors/base16-rose-pine-moon.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Rosé Pine Moon scheme by Emilia Dunfelt <sayhi@dunfelt.se>
+-- Rosé Pine Moon scheme by Emilia Dunfelt &lt;sayhi@dunfelt.se&gt;
 
 local gui00 = "232136"
 local gui01 = "2a273f"
diff --git a/colors/base16-rose-pine.lua b/colors/base16-rose-pine.lua
index 60ad957..1537140 100644
--- a/colors/base16-rose-pine.lua
+++ b/colors/base16-rose-pine.lua
@@ -3,7 +3,7 @@
 -- based on
 -- base16-vim (https://github.com/chriskempson/base16-vim)
 -- by Chris Kempson (http://chriskempson.com)
--- Rosé Pine scheme by Emilia Dunfelt <sayhi@dunfelt.se>
+-- Rosé Pine scheme by Emilia Dunfelt &lt;sayhi@dunfelt.se&gt;
 
 local gui00 = "191724"
 local gui01 = "1f1d2e"
diff --git a/colors/base16-tender.lua b/colors/base16-tender.lua
index bbe06f0..c471ce9 100644
--- a/colors/base16-tender.lua
+++ b/colors/base16-tender.lua
@@ -8,11 +8,11 @@
 local gui00 = "282828"
 local gui01 = "383838"
 local gui02 = "484848"
-local gui03 = "1d1d1d"
+local gui03 = "4c4c4c"
 local gui04 = "b8b8b8"
 local gui05 = "eeeeee"
 local gui06 = "e8e8e8"
-local gui07 = "ffffff"
+local gui07 = "feffff"
 local gui08 = "f43753"
 local gui09 = "dc9656"
 local gui0A = "ffc24b"
diff --git a/colors/base16-tokyo-city-dark.lua b/colors/base16-tokyo-city-dark.lua
new file mode 100644
index 0000000..9751a5a
--- /dev/null
+++ b/colors/base16-tokyo-city-dark.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo City Dark scheme by Michaël Ball
+
+local gui00 = "171D23"
+local gui01 = "1D252C"
+local gui02 = "28323A"
+local gui03 = "526270"
+local gui04 = "B7C5D3"
+local gui05 = "D8E2EC"
+local gui06 = "F6F6F8"
+local gui07 = "FBFBFD"
+local gui08 = "F7768E"
+local gui09 = "FF9E64"
+local gui0A = "B7C5D3"
+local gui0B = "9ECE6A"
+local gui0C = "89DDFF"
+local gui0D = "7AA2F7"
+local gui0E = "BB9AF7"
+local gui0F = "BB9AF7"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-city-dark"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-city-light.lua b/colors/base16-tokyo-city-light.lua
new file mode 100644
index 0000000..e07403d
--- /dev/null
+++ b/colors/base16-tokyo-city-light.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo City Light scheme by Michaël Ball
+
+local gui00 = "FBFBFD"
+local gui01 = "F6F6F8"
+local gui02 = "EDEFF6"
+local gui03 = "9699A3"
+local gui04 = "4c505e"
+local gui05 = "343B59"
+local gui06 = "1D252C"
+local gui07 = "171D23"
+local gui08 = "8C4351"
+local gui09 = "965027"
+local gui0A = "4C505E"
+local gui0B = "485E30"
+local gui0C = "4C505E"
+local gui0D = "34548a"
+local gui0E = "5A4A78"
+local gui0F = "5A4A78"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-city-light"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-city-terminal-dark.lua b/colors/base16-tokyo-city-terminal-dark.lua
new file mode 100644
index 0000000..81ad3b0
--- /dev/null
+++ b/colors/base16-tokyo-city-terminal-dark.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo City Terminal Dark scheme by Michaël Ball
+
+local gui00 = "171D23"
+local gui01 = "1D252C"
+local gui02 = "28323A"
+local gui03 = "526270"
+local gui04 = "B7C5D3"
+local gui05 = "D8E2EC"
+local gui06 = "F6F6F8"
+local gui07 = "FBFBFD"
+local gui08 = "D95468"
+local gui09 = "FF9E64"
+local gui0A = "EBBF83"
+local gui0B = "8BD49C"
+local gui0C = "70E1E8"
+local gui0D = "539AFC"
+local gui0E = "B62D65"
+local gui0F = "DD9D82"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-city-terminal-dark"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-city-terminal-light.lua b/colors/base16-tokyo-city-terminal-light.lua
new file mode 100644
index 0000000..0c4a8a2
--- /dev/null
+++ b/colors/base16-tokyo-city-terminal-light.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo City Terminal Light scheme by Michaël Ball
+
+local gui00 = "FBFBFD"
+local gui01 = "F6F6F8"
+local gui02 = "D8E2EC"
+local gui03 = "B7C5D3"
+local gui04 = "526270"
+local gui05 = "28323A"
+local gui06 = "1D252C"
+local gui07 = "171D23"
+local gui08 = "8C4351"
+local gui09 = "965027"
+local gui0A = "8f5E15"
+local gui0B = "33635C"
+local gui0C = "0F4B6E"
+local gui0D = "34548A"
+local gui0E = "5A4A78"
+local gui0F = "7E5140"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-city-terminal-light"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-dark.lua b/colors/base16-tokyo-night-dark.lua
new file mode 100644
index 0000000..63ac621
--- /dev/null
+++ b/colors/base16-tokyo-night-dark.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Dark scheme by Michaël Ball
+
+local gui00 = "1A1B26"
+local gui01 = "16161E"
+local gui02 = "2F3549"
+local gui03 = "444B6A"
+local gui04 = "787C99"
+local gui05 = "A9B1D6"
+local gui06 = "CBCCD1"
+local gui07 = "D5D6DB"
+local gui08 = "C0CAF5"
+local gui09 = "A9B1D6"
+local gui0A = "0DB9D7"
+local gui0B = "9ECE6A"
+local gui0C = "B4F9F8"
+local gui0D = "2AC3DE"
+local gui0E = "BB9AF7"
+local gui0F = "F7768E"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-dark"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-light.lua b/colors/base16-tokyo-night-light.lua
new file mode 100644
index 0000000..077a61a
--- /dev/null
+++ b/colors/base16-tokyo-night-light.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Light scheme by Michaël Ball
+
+local gui00 = "D5D6DB"
+local gui01 = "CBCCD1"
+local gui02 = "DFE0E5"
+local gui03 = "9699A3"
+local gui04 = "4C505E"
+local gui05 = "343B59"
+local gui06 = "1A1B26"
+local gui07 = "1A1B26"
+local gui08 = "343B58"
+local gui09 = "965027"
+local gui0A = "166775"
+local gui0B = "485E30"
+local gui0C = "3E6968"
+local gui0D = "34548A"
+local gui0E = "5A4A78"
+local gui0F = "8C4351"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-light"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-storm.lua b/colors/base16-tokyo-night-storm.lua
new file mode 100644
index 0000000..05feb28
--- /dev/null
+++ b/colors/base16-tokyo-night-storm.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Storm scheme by Michaël Ball
+
+local gui00 = "24283B"
+local gui01 = "16161E"
+local gui02 = "343A52"
+local gui03 = "444B6A"
+local gui04 = "787C99"
+local gui05 = "A9B1D6"
+local gui06 = "CBCCD1"
+local gui07 = "D5D6DB"
+local gui08 = "C0CAF5"
+local gui09 = "A9B1D6"
+local gui0A = "0DB9D7"
+local gui0B = "9ECE6A"
+local gui0C = "B4F9F8"
+local gui0D = "2AC3DE"
+local gui0E = "BB9AF7"
+local gui0F = "F7768E"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-storm"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-terminal-dark.lua b/colors/base16-tokyo-night-terminal-dark.lua
new file mode 100644
index 0000000..57d058e
--- /dev/null
+++ b/colors/base16-tokyo-night-terminal-dark.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Terminal Dark scheme by Michaël Ball
+
+local gui00 = "16161E"
+local gui01 = "1A1B26"
+local gui02 = "2F3549"
+local gui03 = "444B6A"
+local gui04 = "787C99"
+local gui05 = "787C99"
+local gui06 = "CBCCD1"
+local gui07 = "D5D6DB"
+local gui08 = "F7768E"
+local gui09 = "FF9E64"
+local gui0A = "E0AF68"
+local gui0B = "41A6B5"
+local gui0C = "7DCFFF"
+local gui0D = "7AA2F7"
+local gui0E = "BB9AF7"
+local gui0F = "D18616"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-terminal-dark"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-terminal-light.lua b/colors/base16-tokyo-night-terminal-light.lua
new file mode 100644
index 0000000..1252aa7
--- /dev/null
+++ b/colors/base16-tokyo-night-terminal-light.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Terminal Light scheme by Michaël Ball
+
+local gui00 = "D5D6DB"
+local gui01 = "CBCCD1"
+local gui02 = "DFE0E5"
+local gui03 = "9699A3"
+local gui04 = "4C505E"
+local gui05 = "4C505E"
+local gui06 = "1A1B26"
+local gui07 = "1A1B26"
+local gui08 = "8C4351"
+local gui09 = "965027"
+local gui0A = "8F5E15"
+local gui0B = "33635C"
+local gui0C = "0F4B6E"
+local gui0D = "34548A"
+local gui0E = "5A4A78"
+local gui0F = "655259"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-terminal-light"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua
diff --git a/colors/base16-tokyo-night-terminal-storm.lua b/colors/base16-tokyo-night-terminal-storm.lua
new file mode 100644
index 0000000..2efc121
--- /dev/null
+++ b/colors/base16-tokyo-night-terminal-storm.lua
@@ -0,0 +1,306 @@
+-- base16-nvim (https://github.com/wincent/base16-nvim)
+-- by Greg Hurrell (https://github.com/wincent)
+-- based on
+-- base16-vim (https://github.com/chriskempson/base16-vim)
+-- by Chris Kempson (http://chriskempson.com)
+-- Tokyo Night Terminal Storm scheme by Michaël Ball
+
+local gui00 = "24283B"
+local gui01 = "1A1B26"
+local gui02 = "343A52"
+local gui03 = "444B6A"
+local gui04 = "787C99"
+local gui05 = "787C99"
+local gui06 = "CBCCD1"
+local gui07 = "D5D6DB"
+local gui08 = "F7768E"
+local gui09 = "FF9E64"
+local gui0A = "E0AF68"
+local gui0B = "41A6B5"
+local gui0C = "7DCFFF"
+local gui0D = "7AA2F7"
+local gui0E = "BB9AF7"
+local gui0F = "D18616"
+
+local cterm00 = "00"
+local cterm03 = "08"
+local cterm05 = "07"
+local cterm07 = "15"
+local cterm08 = "01"
+local cterm0A = "03"
+local cterm0B = "02"
+local cterm0C = "06"
+local cterm0D = "04"
+local cterm0E = "05"
+local cterm01 = "10"
+local cterm02 = "11"
+local cterm04 = "12"
+local cterm06 = "13"
+local cterm09 = "09"
+local cterm0F = "14"
+
+vim.cmd [[
+  highlight clear
+  syntax reset
+]]
+vim.g.colors_name = "base16-tokyo-night-terminal-storm"
+
+local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  attr = attr or ""
+  guisp = guisp or ""
+
+  local command = ""
+
+  if guifg ~= "" then
+    command = command .. " guifg=#" .. guifg
+  end
+  if guibg ~= "" then
+    command = command .. " guibg=#" .. guibg
+  end
+  if ctermfg ~= "" then
+    command = command .. " ctermfg=" .. ctermfg
+  end
+  if ctermbg ~= "" then
+    command = command .. " ctermbg=" .. ctermbg
+  end
+  if attr ~= "" then
+    command = command .. " gui=" .. attr .. " cterm=" .. attr
+  end
+  if guisp ~= "" then
+    command = command .. " guisp=#" .. guisp
+  end
+
+  if command ~= "" then
+    vim.cmd("highlight " .. group .. command)
+  end
+end
+
+-- Vim editor colors
+highlight("Normal",        gui05, gui00, cterm05, cterm00, "", "")
+highlight("Bold",          "", "", "", "", "bold", "")
+highlight("Debug",         gui08, "", cterm08, "", "", "")
+highlight("Directory",     gui0D, "", cterm0D, "", "", "")
+highlight("Error",         gui00, gui08, cterm00, cterm08, "", "")
+highlight("ErrorMsg",      gui08, gui00, cterm08, cterm00, "", "")
+highlight("Exception",     gui08, "", cterm08, "", "", "")
+highlight("FoldColumn",    gui0C, gui01, cterm0C, cterm01, "", "")
+highlight("Folded",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("IncSearch",     gui01, gui09, cterm01, cterm09, "none", "")
+highlight("Italic",        "", "", "", "", "none", "")
+highlight("Macro",         gui08, "", cterm08, "", "", "")
+highlight("MatchParen",    "", gui03, "", cterm03,  "", "")
+highlight("ModeMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("MoreMsg",       gui0B, "", cterm0B, "", "", "")
+highlight("Question",      gui0D, "", cterm0D, "", "", "")
+highlight("Search",        gui01, gui0A, cterm01, cterm0A,  "", "")
+highlight("Substitute",    gui01, gui0A, cterm01, cterm0A, "none", "")
+highlight("SpecialKey",    gui03, "", cterm03, "", "", "")
+highlight("TooLong",       gui08, "", cterm08, "", "", "")
+highlight("Underlined",    gui08, "", cterm08, "", "", "")
+highlight("Visual",        "", gui02, "", cterm02, "", "")
+highlight("VisualNOS",     gui08, "", cterm08, "", "", "")
+highlight("WarningMsg",    gui08, "", cterm08, "", "", "")
+highlight("WildMenu",      gui08, gui0A, cterm08, "", "", "")
+highlight("Title",         gui0D, "", cterm0D, "", "none", "")
+highlight("Conceal",       gui0D, gui00, cterm0D, cterm00, "", "")
+highlight("Cursor",        gui00, gui05, cterm00, cterm05, "", "")
+highlight("NonText",       gui03, "", cterm03, "", "", "")
+highlight("LineNr",        gui03, gui01, cterm03, cterm01, "", "")
+highlight("SignColumn",    gui03, gui01, cterm03, cterm01, "", "")
+highlight("StatusLine",    gui04, gui02, cterm04, cterm02, "none", "")
+highlight("StatusLineNC",  gui03, gui01, cterm03, cterm01, "none", "")
+highlight("VertSplit",     gui02, gui02, cterm02, cterm02, "none", "")
+highlight("ColorColumn",   "", gui01, "", cterm01, "none", "")
+highlight("CursorColumn",  "", gui01, "", cterm01, "none", "")
+highlight("CursorLine",    "", gui01, "", cterm01, "none", "")
+highlight("CursorLineNr",  gui04, gui01, cterm04, cterm01, "", "")
+highlight("QuickFixLine",  "", gui01, "", cterm01, "none", "")
+highlight("PMenu",         gui05, gui01, cterm05, cterm01, "none", "")
+highlight("PMenuSel",      gui01, gui05, cterm01, cterm05, "", "")
+highlight("TabLine",       gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineFill",   gui03, gui01, cterm03, cterm01, "none", "")
+highlight("TabLineSel",    gui0B, gui01, cterm0B, cterm01, "none", "")
+
+-- Standard syntax highlighting
+highlight("Boolean",      gui09, "", cterm09, "", "", "")
+highlight("Character",    gui08, "", cterm08, "", "", "")
+highlight("Comment",      gui03, "", cterm03, "", "", "")
+highlight("Conditional",  gui0E, "", cterm0E, "", "", "")
+highlight("Constant",     gui09, "", cterm09, "", "", "")
+highlight("Define",       gui0E, "", cterm0E, "", "none", "")
+highlight("Delimiter",    gui0F, "", cterm0F, "", "", "")
+highlight("Float",        gui09, "", cterm09, "", "", "")
+highlight("Function",     gui0D, "", cterm0D, "", "", "")
+highlight("Identifier",   gui08, "", cterm08, "", "none", "")
+highlight("Include",      gui0D, "", cterm0D, "", "", "")
+highlight("Keyword",      gui0E, "", cterm0E, "", "", "")
+highlight("Label",        gui0A, "", cterm0A, "", "", "")
+highlight("Number",       gui09, "", cterm09, "", "", "")
+highlight("Operator",     gui05, "", cterm05, "", "none", "")
+highlight("PreProc",      gui0A, "", cterm0A, "", "", "")
+highlight("Repeat",       gui0A, "", cterm0A, "", "", "")
+highlight("Special",      gui0C, "", cterm0C, "", "", "")
+highlight("SpecialChar",  gui0F, "", cterm0F, "", "", "")
+highlight("Statement",    gui08, "", cterm08, "", "", "")
+highlight("StorageClass", gui0A, "", cterm0A, "", "", "")
+highlight("String",       gui0B, "", cterm0B, "", "", "")
+highlight("Structure",    gui0E, "", cterm0E, "", "", "")
+highlight("Tag",          gui0A, "", cterm0A, "", "", "")
+highlight("Todo",         gui0A, gui01, cterm0A, cterm01, "", "")
+highlight("Type",         gui0A, "", cterm0A, "", "none", "")
+highlight("Typedef",      gui0A, "", cterm0A, "", "", "")
+
+-- C highlighting
+highlight("cOperator",   gui0C, "", cterm0C, "", "", "")
+highlight("cPreCondit",  gui0E, "", cterm0E, "", "", "")
+
+-- C# highlighting
+highlight("csClass",                 gui0A, "", cterm0A, "", "", "")
+highlight("csAttribute",             gui0A, "", cterm0A, "", "", "")
+highlight("csModifier",              gui0E, "", cterm0E, "", "", "")
+highlight("csType",                  gui08, "", cterm08, "", "", "")
+highlight("csUnspecifiedStatement",  gui0D, "", cterm0D, "", "", "")
+highlight("csContextualStatement",   gui0E, "", cterm0E, "", "", "")
+highlight("csNewDecleration",        gui08, "", cterm08, "", "", "")
+
+-- CSS highlighting
+highlight("cssBraces",      gui05, "", cterm05, "", "", "")
+highlight("cssClassName",   gui0E, "", cterm0E, "", "", "")
+highlight("cssColor",       gui0C, "", cterm0C, "", "", "")
+
+-- Diff highlighting
+highlight("DiffAdd",      gui0B, gui01,  cterm0B, cterm01, "", "")
+highlight("DiffChange",   gui03, gui01,  cterm03, cterm01, "", "")
+highlight("DiffDelete",   gui08, gui01,  cterm08, cterm01, "", "")
+highlight("DiffText",     gui0D, gui01,  cterm0D, cterm01, "", "")
+highlight("DiffAdded",    gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffFile",     gui08, gui00,  cterm08, cterm00, "", "")
+highlight("DiffNewFile",  gui0B, gui00,  cterm0B, cterm00, "", "")
+highlight("DiffLine",     gui0D, gui00,  cterm0D, cterm00, "", "")
+highlight("DiffRemoved",  gui08, gui00,  cterm08, cterm00, "", "")
+
+-- Git highlighting
+highlight("gitcommitOverflow",       gui08, "", cterm08, "", "", "")
+highlight("gitcommitSummary",        gui0B, "", cterm0B, "", "", "")
+highlight("gitcommitComment",        gui03, "", cterm03, "", "", "")
+highlight("gitcommitUntracked",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitDiscarded",      gui03, "", cterm03, "", "", "")
+highlight("gitcommitSelected",       gui03, "", cterm03, "", "", "")
+highlight("gitcommitHeader",         gui0E, "", cterm0E, "", "", "")
+highlight("gitcommitSelectedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitUnmergedType",   gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitDiscardedType",  gui0D, "", cterm0D, "", "", "")
+highlight("gitcommitBranch",         gui09, "", cterm09, "", "bold", "")
+highlight("gitcommitUntrackedFile",  gui0A, "", cterm0A, "", "", "")
+highlight("gitcommitUnmergedFile",   gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitDiscardedFile",  gui08, "", cterm08, "", "bold", "")
+highlight("gitcommitSelectedFile",   gui0B, "", cterm0B, "", "bold", "")
+
+-- GitGutter highlighting
+highlight("GitGutterAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("GitGutterChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("GitGutterDelete",  gui08, gui01, cterm08, cterm01, "", "")
+highlight("GitGutterChangeDelete",  gui0E, gui01, cterm0E, cterm01, "", "")
+
+-- HTML highlighting
+highlight("htmlBold",    gui0A, "", cterm0A, "", "", "")
+highlight("htmlItalic",  gui0E, "", cterm0E, "", "", "")
+highlight("htmlEndTag",  gui05, "", cterm05, "", "", "")
+highlight("htmlTag",     gui05, "", cterm05, "", "", "")
+
+-- JavaScript highlighting
+highlight("javaScript",        gui05, "", cterm05, "", "", "")
+highlight("javaScriptBraces",  gui05, "", cterm05, "", "", "")
+highlight("javaScriptNumber",  gui09, "", cterm09, "", "", "")
+
+-- pangloss/vim-javascript highlighting
+highlight("jsOperator",          gui0D, "", cterm0D, "", "", "")
+highlight("jsStatement",         gui0E, "", cterm0E, "", "", "")
+highlight("jsReturn",            gui0E, "", cterm0E, "", "", "")
+highlight("jsThis",              gui08, "", cterm08, "", "", "")
+highlight("jsClassDefinition",   gui0A, "", cterm0A, "", "", "")
+highlight("jsFunction",          gui0E, "", cterm0E, "", "", "")
+highlight("jsFuncName",          gui0D, "", cterm0D, "", "", "")
+highlight("jsFuncCall",          gui0D, "", cterm0D, "", "", "")
+highlight("jsClassFuncName",     gui0D, "", cterm0D, "", "", "")
+highlight("jsClassMethodType",   gui0E, "", cterm0E, "", "", "")
+highlight("jsRegexpString",      gui0C, "", cterm0C, "", "", "")
+highlight("jsGlobalObjects",     gui0A, "", cterm0A, "", "", "")
+highlight("jsGlobalNodeObjects", gui0A, "", cterm0A, "", "", "")
+highlight("jsExceptions",        gui0A, "", cterm0A, "", "", "")
+highlight("jsBuiltins",          gui0A, "", cterm0A, "", "", "")
+
+-- Mail highlighting
+highlight("mailQuoted1",  gui0A, "", cterm0A, "", "", "")
+highlight("mailQuoted2",  gui0B, "", cterm0B, "", "", "")
+highlight("mailQuoted3",  gui0E, "", cterm0E, "", "", "")
+highlight("mailQuoted4",  gui0C, "", cterm0C, "", "", "")
+highlight("mailQuoted5",  gui0D, "", cterm0D, "", "", "")
+highlight("mailQuoted6",  gui0A, "", cterm0A, "", "", "")
+highlight("mailURL",      gui0D, "", cterm0D, "", "", "")
+highlight("mailEmail",    gui0D, "", cterm0D, "", "", "")
+
+-- Markdown highlighting
+highlight("markdownCode",              gui0B, "", cterm0B, "", "", "")
+highlight("markdownError",             gui05, gui00, cterm05, cterm00, "", "")
+highlight("markdownCodeBlock",         gui0B, "", cterm0B, "", "", "")
+highlight("markdownHeadingDelimiter",  gui0D, "", cterm0D, "", "", "")
+
+-- NERDTree highlighting
+highlight("NERDTreeDirSlash",  gui0D, "", cterm0D, "", "", "")
+highlight("NERDTreeExecFile",  gui05, "", cterm05, "", "", "")
+
+-- PHP highlighting
+highlight("phpMemberSelector",  gui05, "", cterm05, "", "", "")
+highlight("phpComparison",      gui05, "", cterm05, "", "", "")
+highlight("phpParent",          gui05, "", cterm05, "", "", "")
+highlight("phpMethodsVar",      gui0C, "", cterm0C, "", "", "")
+
+-- Python highlighting
+highlight("pythonOperator",  gui0E, "", cterm0E, "", "", "")
+highlight("pythonRepeat",    gui0E, "", cterm0E, "", "", "")
+highlight("pythonInclude",   gui0E, "", cterm0E, "", "", "")
+highlight("pythonStatement", gui0E, "", cterm0E, "", "", "")
+
+-- Ruby highlighting
+highlight("rubyAttribute",               gui0D, "", cterm0D, "", "", "")
+highlight("rubyConstant",                gui0A, "", cterm0A, "", "", "")
+highlight("rubyInterpolationDelimiter",  gui0F, "", cterm0F, "", "", "")
+highlight("rubyRegexp",                  gui0C, "", cterm0C, "", "", "")
+highlight("rubySymbol",                  gui0B, "", cterm0B, "", "", "")
+highlight("rubyStringDelimiter",         gui0B, "", cterm0B, "", "", "")
+
+-- SASS highlighting
+highlight("sassidChar",     gui08, "", cterm08, "", "", "")
+highlight("sassClassChar",  gui09, "", cterm09, "", "", "")
+highlight("sassInclude",    gui0E, "", cterm0E, "", "", "")
+highlight("sassMixing",     gui0E, "", cterm0E, "", "", "")
+highlight("sassMixinName",  gui0D, "", cterm0D, "", "", "")
+
+-- Signify highlighting
+highlight("SignifySignAdd",     gui0B, gui01, cterm0B, cterm01, "", "")
+highlight("SignifySignChange",  gui0D, gui01, cterm0D, cterm01, "", "")
+highlight("SignifySignDelete",  gui08, gui01, cterm08, cterm01, "", "")
+
+-- Spelling highlighting
+highlight("SpellBad",     "", "", "", "", "undercurl", gui08)
+highlight("SpellLocal",   "", "", "", "", "undercurl", gui0C)
+highlight("SpellCap",     "", "", "", "", "undercurl", gui0D)
+highlight("SpellRare",    "", "", "", "", "undercurl", gui0E)
+
+-- Startify highlighting
+highlight("StartifyBracket",  gui03, "", cterm03, "", "", "")
+highlight("StartifyFile",     gui07, "", cterm07, "", "", "")
+highlight("StartifyFooter",   gui03, "", cterm03, "", "", "")
+highlight("StartifyHeader",   gui0B, "", cterm0B, "", "", "")
+highlight("StartifyNumber",   gui09, "", cterm09, "", "", "")
+highlight("StartifyPath",     gui03, "", cterm03, "", "", "")
+highlight("StartifySection",  gui0E, "", cterm0E, "", "", "")
+highlight("StartifySelect",   gui0C, "", cterm0C, "", "", "")
+highlight("StartifySlash",    gui03, "", cterm03, "", "", "")
+highlight("StartifySpecial",  gui03, "", cterm03, "", "", "")
+
+-- Java highlighting
+highlight("javaOperator",     gui0D, "", cterm0D, "", "", "")
+
+-- vim: filetype=lua