Merge pull request #140 from anuragsoni/update-color-schemes

Update color schemes

84 files changed, 2786 insertions, 0 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 748e5e5..d4fc814 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#090300"
+  let g:terminal_color_1 =  "#db2d20"
+  let g:terminal_color_2 =  "#01a252"
+  let g:terminal_color_3 =  "#fded02"
+  let g:terminal_color_4 =  "#01a0e4"
+  let g:terminal_color_5 =  "#a16a94"
+  let g:terminal_color_6 =  "#b5e4f4"
+  let g:terminal_color_7 =  "#a5a2a2"
+  let g:terminal_color_8 =  "#5c5855"
+  let g:terminal_color_9 =  "#e8bbd0"
+  let g:terminal_color_10 = "#3a3432"
+  let g:terminal_color_11 = "#4a4543"
+  let g:terminal_color_12 = "#807d7c"
+  let g:terminal_color_13 = "#d6d5d4"
+  let g:terminal_color_14 = "#cdab53"
+  let g:terminal_color_15 = "#f7f7f7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index 037bdca..96aff01 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#031A16"
+  let g:terminal_color_1 =  "#3E9688"
+  let g:terminal_color_2 =  "#883E96"
+  let g:terminal_color_3 =  "#3E4C96"
+  let g:terminal_color_4 =  "#96883E"
+  let g:terminal_color_5 =  "#4C963E"
+  let g:terminal_color_6 =  "#963E4C"
+  let g:terminal_color_7 =  "#81B5AC"
+  let g:terminal_color_8 =  "#2B685E"
+  let g:terminal_color_9 =  "#3E7996"
+  let g:terminal_color_10 = "#0B342D"
+  let g:terminal_color_11 = "#184E45"
+  let g:terminal_color_12 = "#5F9C92"
+  let g:terminal_color_13 = "#A7CEC8"
+  let g:terminal_color_14 = "#3E965B"
+  let g:terminal_color_15 = "#D2E7E4"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 9654fb2..89cc2f3 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1C2023"
+  let g:terminal_color_1 =  "#C7AE95"
+  let g:terminal_color_2 =  "#95C7AE"
+  let g:terminal_color_3 =  "#AEC795"
+  let g:terminal_color_4 =  "#AE95C7"
+  let g:terminal_color_5 =  "#C795AE"
+  let g:terminal_color_6 =  "#95AEC7"
+  let g:terminal_color_7 =  "#C7CCD1"
+  let g:terminal_color_8 =  "#747C84"
+  let g:terminal_color_9 =  "#C7C795"
+  let g:terminal_color_10 = "#393F45"
+  let g:terminal_color_11 = "#565E65"
+  let g:terminal_color_12 = "#ADB3BA"
+  let g:terminal_color_13 = "#DFE2E5"
+  let g:terminal_color_14 = "#C79595"
+  let g:terminal_color_15 = "#F3F4F5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 1b43ac4..9e62230 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#efecf4"
+  let g:terminal_color_1 =  "#be4678"
+  let g:terminal_color_2 =  "#2a9292"
+  let g:terminal_color_3 =  "#a06e3b"
+  let g:terminal_color_4 =  "#576ddb"
+  let g:terminal_color_5 =  "#955ae7"
+  let g:terminal_color_6 =  "#398bc6"
+  let g:terminal_color_7 =  "#585260"
+  let g:terminal_color_8 =  "#7e7887"
+  let g:terminal_color_9 =  "#aa573c"
+  let g:terminal_color_10 = "#e2dfe7"
+  let g:terminal_color_11 = "#8b8792"
+  let g:terminal_color_12 = "#655f6d"
+  let g:terminal_color_13 = "#26232a"
+  let g:terminal_color_14 = "#bf40bf"
+  let g:terminal_color_15 = "#19171c"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 654d667..2fca9f1 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#19171c"
+  let g:terminal_color_1 =  "#be4678"
+  let g:terminal_color_2 =  "#2a9292"
+  let g:terminal_color_3 =  "#a06e3b"
+  let g:terminal_color_4 =  "#576ddb"
+  let g:terminal_color_5 =  "#955ae7"
+  let g:terminal_color_6 =  "#398bc6"
+  let g:terminal_color_7 =  "#8b8792"
+  let g:terminal_color_8 =  "#655f6d"
+  let g:terminal_color_9 =  "#aa573c"
+  let g:terminal_color_10 = "#26232a"
+  let g:terminal_color_11 = "#585260"
+  let g:terminal_color_12 = "#7e7887"
+  let g:terminal_color_13 = "#e2dfe7"
+  let g:terminal_color_14 = "#bf40bf"
+  let g:terminal_color_15 = "#efecf4"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index f1d7b44..a12272f 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fefbec"
+  let g:terminal_color_1 =  "#d73737"
+  let g:terminal_color_2 =  "#60ac39"
+  let g:terminal_color_3 =  "#ae9513"
+  let g:terminal_color_4 =  "#6684e1"
+  let g:terminal_color_5 =  "#b854d4"
+  let g:terminal_color_6 =  "#1fad83"
+  let g:terminal_color_7 =  "#6e6b5e"
+  let g:terminal_color_8 =  "#999580"
+  let g:terminal_color_9 =  "#b65611"
+  let g:terminal_color_10 = "#e8e4cf"
+  let g:terminal_color_11 = "#a6a28c"
+  let g:terminal_color_12 = "#7d7a68"
+  let g:terminal_color_13 = "#292824"
+  let g:terminal_color_14 = "#d43552"
+  let g:terminal_color_15 = "#20201d"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 688ebc7..c6a7485 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#20201d"
+  let g:terminal_color_1 =  "#d73737"
+  let g:terminal_color_2 =  "#60ac39"
+  let g:terminal_color_3 =  "#ae9513"
+  let g:terminal_color_4 =  "#6684e1"
+  let g:terminal_color_5 =  "#b854d4"
+  let g:terminal_color_6 =  "#1fad83"
+  let g:terminal_color_7 =  "#a6a28c"
+  let g:terminal_color_8 =  "#7d7a68"
+  let g:terminal_color_9 =  "#b65611"
+  let g:terminal_color_10 = "#292824"
+  let g:terminal_color_11 = "#6e6b5e"
+  let g:terminal_color_12 = "#999580"
+  let g:terminal_color_13 = "#e8e4cf"
+  let g:terminal_color_14 = "#d43552"
+  let g:terminal_color_15 = "#fefbec"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 46bb22c..41c52bb 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f4f3ec"
+  let g:terminal_color_1 =  "#ba6236"
+  let g:terminal_color_2 =  "#7d9726"
+  let g:terminal_color_3 =  "#a5980d"
+  let g:terminal_color_4 =  "#36a166"
+  let g:terminal_color_5 =  "#5f9182"
+  let g:terminal_color_6 =  "#5b9d48"
+  let g:terminal_color_7 =  "#5f5e4e"
+  let g:terminal_color_8 =  "#878573"
+  let g:terminal_color_9 =  "#ae7313"
+  let g:terminal_color_10 = "#e7e6df"
+  let g:terminal_color_11 = "#929181"
+  let g:terminal_color_12 = "#6c6b5a"
+  let g:terminal_color_13 = "#302f27"
+  let g:terminal_color_14 = "#9d6c7c"
+  let g:terminal_color_15 = "#22221b"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index a069b6e..4bb8df8 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#22221b"
+  let g:terminal_color_1 =  "#ba6236"
+  let g:terminal_color_2 =  "#7d9726"
+  let g:terminal_color_3 =  "#a5980d"
+  let g:terminal_color_4 =  "#36a166"
+  let g:terminal_color_5 =  "#5f9182"
+  let g:terminal_color_6 =  "#5b9d48"
+  let g:terminal_color_7 =  "#929181"
+  let g:terminal_color_8 =  "#6c6b5a"
+  let g:terminal_color_9 =  "#ae7313"
+  let g:terminal_color_10 = "#302f27"
+  let g:terminal_color_11 = "#5f5e4e"
+  let g:terminal_color_12 = "#878573"
+  let g:terminal_color_13 = "#e7e6df"
+  let g:terminal_color_14 = "#9d6c7c"
+  let g:terminal_color_15 = "#f4f3ec"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index 332e497..559ba54 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f1efee"
+  let g:terminal_color_1 =  "#f22c40"
+  let g:terminal_color_2 =  "#7b9726"
+  let g:terminal_color_3 =  "#c38418"
+  let g:terminal_color_4 =  "#407ee7"
+  let g:terminal_color_5 =  "#6666ea"
+  let g:terminal_color_6 =  "#3d97b8"
+  let g:terminal_color_7 =  "#68615e"
+  let g:terminal_color_8 =  "#9c9491"
+  let g:terminal_color_9 =  "#df5320"
+  let g:terminal_color_10 = "#e6e2e0"
+  let g:terminal_color_11 = "#a8a19f"
+  let g:terminal_color_12 = "#766e6b"
+  let g:terminal_color_13 = "#2c2421"
+  let g:terminal_color_14 = "#c33ff3"
+  let g:terminal_color_15 = "#1b1918"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index 0cb5172..5930123 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1b1918"
+  let g:terminal_color_1 =  "#f22c40"
+  let g:terminal_color_2 =  "#7b9726"
+  let g:terminal_color_3 =  "#c38418"
+  let g:terminal_color_4 =  "#407ee7"
+  let g:terminal_color_5 =  "#6666ea"
+  let g:terminal_color_6 =  "#3d97b8"
+  let g:terminal_color_7 =  "#a8a19f"
+  let g:terminal_color_8 =  "#766e6b"
+  let g:terminal_color_9 =  "#df5320"
+  let g:terminal_color_10 = "#2c2421"
+  let g:terminal_color_11 = "#68615e"
+  let g:terminal_color_12 = "#9c9491"
+  let g:terminal_color_13 = "#e6e2e0"
+  let g:terminal_color_14 = "#c33ff3"
+  let g:terminal_color_15 = "#f1efee"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 72e5540..61c60ee 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f7f3f7"
+  let g:terminal_color_1 =  "#ca402b"
+  let g:terminal_color_2 =  "#918b3b"
+  let g:terminal_color_3 =  "#bb8a35"
+  let g:terminal_color_4 =  "#516aec"
+  let g:terminal_color_5 =  "#7b59c0"
+  let g:terminal_color_6 =  "#159393"
+  let g:terminal_color_7 =  "#695d69"
+  let g:terminal_color_8 =  "#9e8f9e"
+  let g:terminal_color_9 =  "#a65926"
+  let g:terminal_color_10 = "#d8cad8"
+  let g:terminal_color_11 = "#ab9bab"
+  let g:terminal_color_12 = "#776977"
+  let g:terminal_color_13 = "#292329"
+  let g:terminal_color_14 = "#cc33cc"
+  let g:terminal_color_15 = "#1b181b"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index 86cea14..1e946d7 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1b181b"
+  let g:terminal_color_1 =  "#ca402b"
+  let g:terminal_color_2 =  "#918b3b"
+  let g:terminal_color_3 =  "#bb8a35"
+  let g:terminal_color_4 =  "#516aec"
+  let g:terminal_color_5 =  "#7b59c0"
+  let g:terminal_color_6 =  "#159393"
+  let g:terminal_color_7 =  "#ab9bab"
+  let g:terminal_color_8 =  "#776977"
+  let g:terminal_color_9 =  "#a65926"
+  let g:terminal_color_10 = "#292329"
+  let g:terminal_color_11 = "#695d69"
+  let g:terminal_color_12 = "#9e8f9e"
+  let g:terminal_color_13 = "#d8cad8"
+  let g:terminal_color_14 = "#cc33cc"
+  let g:terminal_color_15 = "#f7f3f7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 635cbee..cc0084e 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ebf8ff"
+  let g:terminal_color_1 =  "#d22d72"
+  let g:terminal_color_2 =  "#568c3b"
+  let g:terminal_color_3 =  "#8a8a0f"
+  let g:terminal_color_4 =  "#257fad"
+  let g:terminal_color_5 =  "#6b6bb8"
+  let g:terminal_color_6 =  "#2d8f6f"
+  let g:terminal_color_7 =  "#516d7b"
+  let g:terminal_color_8 =  "#7195a8"
+  let g:terminal_color_9 =  "#935c25"
+  let g:terminal_color_10 = "#c1e4f6"
+  let g:terminal_color_11 = "#7ea2b4"
+  let g:terminal_color_12 = "#5a7b8c"
+  let g:terminal_color_13 = "#1f292e"
+  let g:terminal_color_14 = "#b72dd2"
+  let g:terminal_color_15 = "#161b1d"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index a7a282a..d21be79 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#161b1d"
+  let g:terminal_color_1 =  "#d22d72"
+  let g:terminal_color_2 =  "#568c3b"
+  let g:terminal_color_3 =  "#8a8a0f"
+  let g:terminal_color_4 =  "#257fad"
+  let g:terminal_color_5 =  "#6b6bb8"
+  let g:terminal_color_6 =  "#2d8f6f"
+  let g:terminal_color_7 =  "#7ea2b4"
+  let g:terminal_color_8 =  "#5a7b8c"
+  let g:terminal_color_9 =  "#935c25"
+  let g:terminal_color_10 = "#1f292e"
+  let g:terminal_color_11 = "#516d7b"
+  let g:terminal_color_12 = "#7195a8"
+  let g:terminal_color_13 = "#c1e4f6"
+  let g:terminal_color_14 = "#b72dd2"
+  let g:terminal_color_15 = "#ebf8ff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 2e41d61..4532ba3 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f4ecec"
+  let g:terminal_color_1 =  "#ca4949"
+  let g:terminal_color_2 =  "#4b8b8b"
+  let g:terminal_color_3 =  "#a06e3b"
+  let g:terminal_color_4 =  "#7272ca"
+  let g:terminal_color_5 =  "#8464c4"
+  let g:terminal_color_6 =  "#5485b6"
+  let g:terminal_color_7 =  "#585050"
+  let g:terminal_color_8 =  "#7e7777"
+  let g:terminal_color_9 =  "#b45a3c"
+  let g:terminal_color_10 = "#e7dfdf"
+  let g:terminal_color_11 = "#8a8585"
+  let g:terminal_color_12 = "#655d5d"
+  let g:terminal_color_13 = "#292424"
+  let g:terminal_color_14 = "#bd5187"
+  let g:terminal_color_15 = "#1b1818"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index e667004..5bbd80c 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1b1818"
+  let g:terminal_color_1 =  "#ca4949"
+  let g:terminal_color_2 =  "#4b8b8b"
+  let g:terminal_color_3 =  "#a06e3b"
+  let g:terminal_color_4 =  "#7272ca"
+  let g:terminal_color_5 =  "#8464c4"
+  let g:terminal_color_6 =  "#5485b6"
+  let g:terminal_color_7 =  "#8a8585"
+  let g:terminal_color_8 =  "#655d5d"
+  let g:terminal_color_9 =  "#b45a3c"
+  let g:terminal_color_10 = "#292424"
+  let g:terminal_color_11 = "#585050"
+  let g:terminal_color_12 = "#7e7777"
+  let g:terminal_color_13 = "#e7dfdf"
+  let g:terminal_color_14 = "#bd5187"
+  let g:terminal_color_15 = "#f4ecec"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index f62e499..8f3ca62 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ecf4ee"
+  let g:terminal_color_1 =  "#b16139"
+  let g:terminal_color_2 =  "#489963"
+  let g:terminal_color_3 =  "#a07e3b"
+  let g:terminal_color_4 =  "#478c90"
+  let g:terminal_color_5 =  "#55859b"
+  let g:terminal_color_6 =  "#1c9aa0"
+  let g:terminal_color_7 =  "#526057"
+  let g:terminal_color_8 =  "#78877d"
+  let g:terminal_color_9 =  "#9f713c"
+  let g:terminal_color_10 = "#dfe7e2"
+  let g:terminal_color_11 = "#87928a"
+  let g:terminal_color_12 = "#5f6d64"
+  let g:terminal_color_13 = "#232a25"
+  let g:terminal_color_14 = "#867469"
+  let g:terminal_color_15 = "#171c19"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 20f178f..9f54bd9 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#171c19"
+  let g:terminal_color_1 =  "#b16139"
+  let g:terminal_color_2 =  "#489963"
+  let g:terminal_color_3 =  "#a07e3b"
+  let g:terminal_color_4 =  "#478c90"
+  let g:terminal_color_5 =  "#55859b"
+  let g:terminal_color_6 =  "#1c9aa0"
+  let g:terminal_color_7 =  "#87928a"
+  let g:terminal_color_8 =  "#5f6d64"
+  let g:terminal_color_9 =  "#9f713c"
+  let g:terminal_color_10 = "#232a25"
+  let g:terminal_color_11 = "#526057"
+  let g:terminal_color_12 = "#78877d"
+  let g:terminal_color_13 = "#dfe7e2"
+  let g:terminal_color_14 = "#867469"
+  let g:terminal_color_15 = "#ecf4ee"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index 6a228ee..dcfd1b0 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f4fbf4"
+  let g:terminal_color_1 =  "#e6193c"
+  let g:terminal_color_2 =  "#29a329"
+  let g:terminal_color_3 =  "#98981b"
+  let g:terminal_color_4 =  "#3d62f5"
+  let g:terminal_color_5 =  "#ad2bee"
+  let g:terminal_color_6 =  "#1999b3"
+  let g:terminal_color_7 =  "#5e6e5e"
+  let g:terminal_color_8 =  "#809980"
+  let g:terminal_color_9 =  "#87711d"
+  let g:terminal_color_10 = "#cfe8cf"
+  let g:terminal_color_11 = "#8ca68c"
+  let g:terminal_color_12 = "#687d68"
+  let g:terminal_color_13 = "#242924"
+  let g:terminal_color_14 = "#e619c3"
+  let g:terminal_color_15 = "#131513"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index 8a4e070..291922f 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#131513"
+  let g:terminal_color_1 =  "#e6193c"
+  let g:terminal_color_2 =  "#29a329"
+  let g:terminal_color_3 =  "#98981b"
+  let g:terminal_color_4 =  "#3d62f5"
+  let g:terminal_color_5 =  "#ad2bee"
+  let g:terminal_color_6 =  "#1999b3"
+  let g:terminal_color_7 =  "#8ca68c"
+  let g:terminal_color_8 =  "#687d68"
+  let g:terminal_color_9 =  "#87711d"
+  let g:terminal_color_10 = "#242924"
+  let g:terminal_color_11 = "#5e6e5e"
+  let g:terminal_color_12 = "#809980"
+  let g:terminal_color_13 = "#cfe8cf"
+  let g:terminal_color_14 = "#e619c3"
+  let g:terminal_color_15 = "#f4fbf4"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index f3e18fe..82ce6d2 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f5f7ff"
+  let g:terminal_color_1 =  "#c94922"
+  let g:terminal_color_2 =  "#ac9739"
+  let g:terminal_color_3 =  "#c08b30"
+  let g:terminal_color_4 =  "#3d8fd1"
+  let g:terminal_color_5 =  "#6679cc"
+  let g:terminal_color_6 =  "#22a2c9"
+  let g:terminal_color_7 =  "#5e6687"
+  let g:terminal_color_8 =  "#898ea4"
+  let g:terminal_color_9 =  "#c76b29"
+  let g:terminal_color_10 = "#dfe2f1"
+  let g:terminal_color_11 = "#979db4"
+  let g:terminal_color_12 = "#6b7394"
+  let g:terminal_color_13 = "#293256"
+  let g:terminal_color_14 = "#9c637a"
+  let g:terminal_color_15 = "#202746"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index 99c5213..59764cb 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#202746"
+  let g:terminal_color_1 =  "#c94922"
+  let g:terminal_color_2 =  "#ac9739"
+  let g:terminal_color_3 =  "#c08b30"
+  let g:terminal_color_4 =  "#3d8fd1"
+  let g:terminal_color_5 =  "#6679cc"
+  let g:terminal_color_6 =  "#22a2c9"
+  let g:terminal_color_7 =  "#979db4"
+  let g:terminal_color_8 =  "#6b7394"
+  let g:terminal_color_9 =  "#c76b29"
+  let g:terminal_color_10 = "#293256"
+  let g:terminal_color_11 = "#5e6687"
+  let g:terminal_color_12 = "#898ea4"
+  let g:terminal_color_13 = "#dfe2f1"
+  let g:terminal_color_14 = "#9c637a"
+  let g:terminal_color_15 = "#f5f7ff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 4a571cb..903ba91 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#28211c"
+  let g:terminal_color_1 =  "#cf6a4c"
+  let g:terminal_color_2 =  "#54be0d"
+  let g:terminal_color_3 =  "#f9ee98"
+  let g:terminal_color_4 =  "#5ea6ea"
+  let g:terminal_color_5 =  "#9b859d"
+  let g:terminal_color_6 =  "#afc4db"
+  let g:terminal_color_7 =  "#8a8986"
+  let g:terminal_color_8 =  "#666666"
+  let g:terminal_color_9 =  "#cf7d34"
+  let g:terminal_color_10 = "#36312e"
+  let g:terminal_color_11 = "#5e5d5c"
+  let g:terminal_color_12 = "#797977"
+  let g:terminal_color_13 = "#9d9b97"
+  let g:terminal_color_14 = "#937121"
+  let g:terminal_color_15 = "#baae9e"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index de4f364..147fbc3 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#0c0d0e"
+  let g:terminal_color_1 =  "#e31a1c"
+  let g:terminal_color_2 =  "#31a354"
+  let g:terminal_color_3 =  "#dca060"
+  let g:terminal_color_4 =  "#3182bd"
+  let g:terminal_color_5 =  "#756bb1"
+  let g:terminal_color_6 =  "#80b1d3"
+  let g:terminal_color_7 =  "#b7b8b9"
+  let g:terminal_color_8 =  "#737475"
+  let g:terminal_color_9 =  "#e6550d"
+  let g:terminal_color_10 = "#2e2f30"
+  let g:terminal_color_11 = "#515253"
+  let g:terminal_color_12 = "#959697"
+  let g:terminal_color_13 = "#dadbdc"
+  let g:terminal_color_14 = "#b15928"
+  let g:terminal_color_15 = "#fcfdfe"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 0df1f83..8aa5fcc 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#fb0120"
+  let g:terminal_color_2 =  "#a1c659"
+  let g:terminal_color_3 =  "#fda331"
+  let g:terminal_color_4 =  "#6fb3d2"
+  let g:terminal_color_5 =  "#d381c3"
+  let g:terminal_color_6 =  "#76c7b7"
+  let g:terminal_color_7 =  "#e0e0e0"
+  let g:terminal_color_8 =  "#b0b0b0"
+  let g:terminal_color_9 =  "#fc6d24"
+  let g:terminal_color_10 = "#303030"
+  let g:terminal_color_11 = "#505050"
+  let g:terminal_color_12 = "#d0d0d0"
+  let g:terminal_color_13 = "#f5f5f5"
+  let g:terminal_color_14 = "#be643c"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 90a8b7f..daab7be 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#151515"
+  let g:terminal_color_1 =  "#fb9fb1"
+  let g:terminal_color_2 =  "#acc267"
+  let g:terminal_color_3 =  "#ddb26f"
+  let g:terminal_color_4 =  "#6fc2ef"
+  let g:terminal_color_5 =  "#e1a3ee"
+  let g:terminal_color_6 =  "#12cfc0"
+  let g:terminal_color_7 =  "#d0d0d0"
+  let g:terminal_color_8 =  "#505050"
+  let g:terminal_color_9 =  "#eda987"
+  let g:terminal_color_10 = "#202020"
+  let g:terminal_color_11 = "#303030"
+  let g:terminal_color_12 = "#b0b0b0"
+  let g:terminal_color_13 = "#e0e0e0"
+  let g:terminal_color_14 = "#deaf8f"
+  let g:terminal_color_15 = "#f5f5f5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index d8a79ea..fc4af66 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#232c31"
+  let g:terminal_color_1 =  "#2a5491"
+  let g:terminal_color_2 =  "#237986"
+  let g:terminal_color_3 =  "#a03b1e"
+  let g:terminal_color_4 =  "#484d79"
+  let g:terminal_color_5 =  "#c59820"
+  let g:terminal_color_6 =  "#b02f30"
+  let g:terminal_color_7 =  "#9ea7a6"
+  let g:terminal_color_8 =  "#3f4944"
+  let g:terminal_color_9 =  "#43820d"
+  let g:terminal_color_10 = "#1c3657"
+  let g:terminal_color_11 = "#2a343a"
+  let g:terminal_color_12 = "#84898c"
+  let g:terminal_color_13 = "#a7cfa3"
+  let g:terminal_color_14 = "#c98344"
+  let g:terminal_color_15 = "#b5d8f6"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index 996ada7..c6072d8 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fbf1f2"
+  let g:terminal_color_1 =  "#D57E85"
+  let g:terminal_color_2 =  "#A3B367"
+  let g:terminal_color_3 =  "#DCB16C"
+  let g:terminal_color_4 =  "#7297B9"
+  let g:terminal_color_5 =  "#BB99B4"
+  let g:terminal_color_6 =  "#69A9A7"
+  let g:terminal_color_7 =  "#8b8198"
+  let g:terminal_color_8 =  "#bfb9c6"
+  let g:terminal_color_9 =  "#EBB790"
+  let g:terminal_color_10 = "#f2f1f4"
+  let g:terminal_color_11 = "#d8d5dd"
+  let g:terminal_color_12 = "#a59daf"
+  let g:terminal_color_13 = "#72677E"
+  let g:terminal_color_14 = "#BAA58C"
+  let g:terminal_color_15 = "#585062"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index 4d3fcfd..aeaac35 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1D2021"
+  let g:terminal_color_1 =  "#FB543F"
+  let g:terminal_color_2 =  "#95C085"
+  let g:terminal_color_3 =  "#FAC03B"
+  let g:terminal_color_4 =  "#0D6678"
+  let g:terminal_color_5 =  "#8F4673"
+  let g:terminal_color_6 =  "#8BA59B"
+  let g:terminal_color_7 =  "#A89984"
+  let g:terminal_color_8 =  "#665C54"
+  let g:terminal_color_9 =  "#FE8625"
+  let g:terminal_color_10 = "#32302F"
+  let g:terminal_color_11 = "#504945"
+  let g:terminal_color_12 = "#928374"
+  let g:terminal_color_13 = "#D5C4A1"
+  let g:terminal_color_14 = "#A87322"
+  let g:terminal_color_15 = "#FDF4C1"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index fb7c3af..5d25900 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#181818"
+  let g:terminal_color_1 =  "#ab4642"
+  let g:terminal_color_2 =  "#a1b56c"
+  let g:terminal_color_3 =  "#f7ca88"
+  let g:terminal_color_4 =  "#7cafc2"
+  let g:terminal_color_5 =  "#ba8baf"
+  let g:terminal_color_6 =  "#86c1b9"
+  let g:terminal_color_7 =  "#d8d8d8"
+  let g:terminal_color_8 =  "#585858"
+  let g:terminal_color_9 =  "#dc9656"
+  let g:terminal_color_10 = "#282828"
+  let g:terminal_color_11 = "#383838"
+  let g:terminal_color_12 = "#b8b8b8"
+  let g:terminal_color_13 = "#e8e8e8"
+  let g:terminal_color_14 = "#a16946"
+  let g:terminal_color_15 = "#f8f8f8"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index 8fdb221..124473c 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f8f8f8"
+  let g:terminal_color_1 =  "#ab4642"
+  let g:terminal_color_2 =  "#a1b56c"
+  let g:terminal_color_3 =  "#f7ca88"
+  let g:terminal_color_4 =  "#7cafc2"
+  let g:terminal_color_5 =  "#ba8baf"
+  let g:terminal_color_6 =  "#86c1b9"
+  let g:terminal_color_7 =  "#383838"
+  let g:terminal_color_8 =  "#b8b8b8"
+  let g:terminal_color_9 =  "#dc9656"
+  let g:terminal_color_10 = "#e8e8e8"
+  let g:terminal_color_11 = "#d8d8d8"
+  let g:terminal_color_12 = "#585858"
+  let g:terminal_color_13 = "#282828"
+  let g:terminal_color_14 = "#a16946"
+  let g:terminal_color_15 = "#181818"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index f505608..676373e 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#282936"
+  let g:terminal_color_1 =  "#ea51b2"
+  let g:terminal_color_2 =  "#ebff87"
+  let g:terminal_color_3 =  "#00f769"
+  let g:terminal_color_4 =  "#62d6e8"
+  let g:terminal_color_5 =  "#b45bcf"
+  let g:terminal_color_6 =  "#a1efe4"
+  let g:terminal_color_7 =  "#e9e9f4"
+  let g:terminal_color_8 =  "#626483"
+  let g:terminal_color_9 =  "#b45bcf"
+  let g:terminal_color_10 = "#3a3c4e"
+  let g:terminal_color_11 = "#4d4f68"
+  let g:terminal_color_12 = "#62d6e8"
+  let g:terminal_color_13 = "#f1f2f8"
+  let g:terminal_color_14 = "#00f769"
+  let g:terminal_color_15 = "#f7f7fb"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 0023b2b..4bff7e2 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2d2d2d"
+  let g:terminal_color_1 =  "#f2777a"
+  let g:terminal_color_2 =  "#99cc99"
+  let g:terminal_color_3 =  "#ffcc66"
+  let g:terminal_color_4 =  "#6699cc"
+  let g:terminal_color_5 =  "#cc99cc"
+  let g:terminal_color_6 =  "#66cccc"
+  let g:terminal_color_7 =  "#d3d0c8"
+  let g:terminal_color_8 =  "#747369"
+  let g:terminal_color_9 =  "#f99157"
+  let g:terminal_color_10 = "#393939"
+  let g:terminal_color_11 = "#515151"
+  let g:terminal_color_12 = "#a09f93"
+  let g:terminal_color_13 = "#e8e6df"
+  let g:terminal_color_14 = "#d27b53"
+  let g:terminal_color_15 = "#f2f0ec"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 9249b8c..2cf4b9b 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#16130F"
+  let g:terminal_color_1 =  "#826D57"
+  let g:terminal_color_2 =  "#57826D"
+  let g:terminal_color_3 =  "#6D8257"
+  let g:terminal_color_4 =  "#6D5782"
+  let g:terminal_color_5 =  "#82576D"
+  let g:terminal_color_6 =  "#576D82"
+  let g:terminal_color_7 =  "#A39A90"
+  let g:terminal_color_8 =  "#5A5047"
+  let g:terminal_color_9 =  "#828257"
+  let g:terminal_color_10 = "#2C2620"
+  let g:terminal_color_11 = "#433B32"
+  let g:terminal_color_12 = "#8A8075"
+  let g:terminal_color_13 = "#BEB6AE"
+  let g:terminal_color_14 = "#825757"
+  let g:terminal_color_15 = "#DBD6D1"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index a5dd4a5..bb59972 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2C3E50"
+  let g:terminal_color_1 =  "#E74C3C"
+  let g:terminal_color_2 =  "#2ECC71"
+  let g:terminal_color_3 =  "#F1C40F"
+  let g:terminal_color_4 =  "#3498DB"
+  let g:terminal_color_5 =  "#9B59B6"
+  let g:terminal_color_6 =  "#1ABC9C"
+  let g:terminal_color_7 =  "#e0e0e0"
+  let g:terminal_color_8 =  "#95A5A6"
+  let g:terminal_color_9 =  "#E67E22"
+  let g:terminal_color_10 = "#34495E"
+  let g:terminal_color_11 = "#7F8C8D"
+  let g:terminal_color_12 = "#BDC3C7"
+  let g:terminal_color_13 = "#f5f5f5"
+  let g:terminal_color_14 = "#be643c"
+  let g:terminal_color_15 = "#ECF0F1"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index b0e701f..264d738 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#ed6a43"
+  let g:terminal_color_2 =  "#183691"
+  let g:terminal_color_3 =  "#795da3"
+  let g:terminal_color_4 =  "#795da3"
+  let g:terminal_color_5 =  "#a71d5d"
+  let g:terminal_color_6 =  "#183691"
+  let g:terminal_color_7 =  "#333333"
+  let g:terminal_color_8 =  "#969896"
+  let g:terminal_color_9 =  "#0086b3"
+  let g:terminal_color_10 = "#f5f5f5"
+  let g:terminal_color_11 = "#c8c8fa"
+  let g:terminal_color_12 = "#e8e8e8"
+  let g:terminal_color_13 = "#ffffff"
+  let g:terminal_color_14 = "#333333"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index 1b7d281..483b66d 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1d1f21"
+  let g:terminal_color_1 =  "#CC342B"
+  let g:terminal_color_2 =  "#198844"
+  let g:terminal_color_3 =  "#FBA922"
+  let g:terminal_color_4 =  "#3971ED"
+  let g:terminal_color_5 =  "#A36AC7"
+  let g:terminal_color_6 =  "#3971ED"
+  let g:terminal_color_7 =  "#c5c8c6"
+  let g:terminal_color_8 =  "#969896"
+  let g:terminal_color_9 =  "#F96A38"
+  let g:terminal_color_10 = "#282a2e"
+  let g:terminal_color_11 = "#373b41"
+  let g:terminal_color_12 = "#b4b7b4"
+  let g:terminal_color_13 = "#e0e0e0"
+  let g:terminal_color_14 = "#3971ED"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index bc55767..d9f298d 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#CC342B"
+  let g:terminal_color_2 =  "#198844"
+  let g:terminal_color_3 =  "#FBA922"
+  let g:terminal_color_4 =  "#3971ED"
+  let g:terminal_color_5 =  "#A36AC7"
+  let g:terminal_color_6 =  "#3971ED"
+  let g:terminal_color_7 =  "#373b41"
+  let g:terminal_color_8 =  "#b4b7b4"
+  let g:terminal_color_9 =  "#F96A38"
+  let g:terminal_color_10 = "#e0e0e0"
+  let g:terminal_color_11 = "#c5c8c6"
+  let g:terminal_color_12 = "#969896"
+  let g:terminal_color_13 = "#282a2e"
+  let g:terminal_color_14 = "#3971ED"
+  let g:terminal_color_15 = "#1d1f21"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index 01d980b..0821062 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#101010"
+  let g:terminal_color_1 =  "#7c7c7c"
+  let g:terminal_color_2 =  "#8e8e8e"
+  let g:terminal_color_3 =  "#a0a0a0"
+  let g:terminal_color_4 =  "#686868"
+  let g:terminal_color_5 =  "#747474"
+  let g:terminal_color_6 =  "#868686"
+  let g:terminal_color_7 =  "#b9b9b9"
+  let g:terminal_color_8 =  "#525252"
+  let g:terminal_color_9 =  "#999999"
+  let g:terminal_color_10 = "#252525"
+  let g:terminal_color_11 = "#464646"
+  let g:terminal_color_12 = "#ababab"
+  let g:terminal_color_13 = "#e3e3e3"
+  let g:terminal_color_14 = "#5e5e5e"
+  let g:terminal_color_15 = "#f7f7f7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index f6e209f..6cb60e3 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f7f7f7"
+  let g:terminal_color_1 =  "#7c7c7c"
+  let g:terminal_color_2 =  "#8e8e8e"
+  let g:terminal_color_3 =  "#a0a0a0"
+  let g:terminal_color_4 =  "#686868"
+  let g:terminal_color_5 =  "#747474"
+  let g:terminal_color_6 =  "#868686"
+  let g:terminal_color_7 =  "#464646"
+  let g:terminal_color_8 =  "#ababab"
+  let g:terminal_color_9 =  "#999999"
+  let g:terminal_color_10 = "#e3e3e3"
+  let g:terminal_color_11 = "#b9b9b9"
+  let g:terminal_color_12 = "#525252"
+  let g:terminal_color_13 = "#252525"
+  let g:terminal_color_14 = "#5e5e5e"
+  let g:terminal_color_15 = "#101010"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index a93d579..7fcba02 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#001100"
+  let g:terminal_color_1 =  "#007700"
+  let g:terminal_color_2 =  "#00bb00"
+  let g:terminal_color_3 =  "#007700"
+  let g:terminal_color_4 =  "#009900"
+  let g:terminal_color_5 =  "#00bb00"
+  let g:terminal_color_6 =  "#005500"
+  let g:terminal_color_7 =  "#00bb00"
+  let g:terminal_color_8 =  "#007700"
+  let g:terminal_color_9 =  "#009900"
+  let g:terminal_color_10 = "#003300"
+  let g:terminal_color_11 = "#005500"
+  let g:terminal_color_12 = "#009900"
+  let g:terminal_color_13 = "#00dd00"
+  let g:terminal_color_14 = "#005500"
+  let g:terminal_color_15 = "#00ff00"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index af569d9..e4ce2f6 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1d2021"
+  let g:terminal_color_1 =  "#fb4934"
+  let g:terminal_color_2 =  "#b8bb26"
+  let g:terminal_color_3 =  "#fabd2f"
+  let g:terminal_color_4 =  "#83a598"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#8ec07c"
+  let g:terminal_color_7 =  "#d5c4a1"
+  let g:terminal_color_8 =  "#665c54"
+  let g:terminal_color_9 =  "#fe8019"
+  let g:terminal_color_10 = "#3c3836"
+  let g:terminal_color_11 = "#504945"
+  let g:terminal_color_12 = "#bdae93"
+  let g:terminal_color_13 = "#ebdbb2"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index 1a5e1ef..3926ba6 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#282828"
+  let g:terminal_color_1 =  "#fb4934"
+  let g:terminal_color_2 =  "#b8bb26"
+  let g:terminal_color_3 =  "#fabd2f"
+  let g:terminal_color_4 =  "#83a598"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#8ec07c"
+  let g:terminal_color_7 =  "#d5c4a1"
+  let g:terminal_color_8 =  "#665c54"
+  let g:terminal_color_9 =  "#fe8019"
+  let g:terminal_color_10 = "#3c3836"
+  let g:terminal_color_11 = "#504945"
+  let g:terminal_color_12 = "#bdae93"
+  let g:terminal_color_13 = "#ebdbb2"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index 7741d0a..a4839e1 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#262626"
+  let g:terminal_color_1 =  "#d75f5f"
+  let g:terminal_color_2 =  "#afaf00"
+  let g:terminal_color_3 =  "#ffaf00"
+  let g:terminal_color_4 =  "#83adad"
+  let g:terminal_color_5 =  "#d485ad"
+  let g:terminal_color_6 =  "#85ad85"
+  let g:terminal_color_7 =  "#dab997"
+  let g:terminal_color_8 =  "#8a8a8a"
+  let g:terminal_color_9 =  "#ff8700"
+  let g:terminal_color_10 = "#3a3a3a"
+  let g:terminal_color_11 = "#4e4e4e"
+  let g:terminal_color_12 = "#949494"
+  let g:terminal_color_13 = "#d5c4a1"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#ebdbb2"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index 54569be..7311489 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#32302f"
+  let g:terminal_color_1 =  "#fb4934"
+  let g:terminal_color_2 =  "#b8bb26"
+  let g:terminal_color_3 =  "#fabd2f"
+  let g:terminal_color_4 =  "#83a598"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#8ec07c"
+  let g:terminal_color_7 =  "#d5c4a1"
+  let g:terminal_color_8 =  "#665c54"
+  let g:terminal_color_9 =  "#fe8019"
+  let g:terminal_color_10 = "#3c3836"
+  let g:terminal_color_11 = "#504945"
+  let g:terminal_color_12 = "#bdae93"
+  let g:terminal_color_13 = "#ebdbb2"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 7fcf1bb..1f3d553 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f9f5d7"
+  let g:terminal_color_1 =  "#9d0006"
+  let g:terminal_color_2 =  "#79740e"
+  let g:terminal_color_3 =  "#b57614"
+  let g:terminal_color_4 =  "#076678"
+  let g:terminal_color_5 =  "#8f3f71"
+  let g:terminal_color_6 =  "#427b58"
+  let g:terminal_color_7 =  "#504945"
+  let g:terminal_color_8 =  "#bdae93"
+  let g:terminal_color_9 =  "#af3a03"
+  let g:terminal_color_10 = "#ebdbb2"
+  let g:terminal_color_11 = "#d5c4a1"
+  let g:terminal_color_12 = "#665c54"
+  let g:terminal_color_13 = "#3c3836"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index 0c954bc..97c7e08 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fbf1c7"
+  let g:terminal_color_1 =  "#9d0006"
+  let g:terminal_color_2 =  "#79740e"
+  let g:terminal_color_3 =  "#b57614"
+  let g:terminal_color_4 =  "#076678"
+  let g:terminal_color_5 =  "#8f3f71"
+  let g:terminal_color_6 =  "#427b58"
+  let g:terminal_color_7 =  "#504945"
+  let g:terminal_color_8 =  "#bdae93"
+  let g:terminal_color_9 =  "#af3a03"
+  let g:terminal_color_10 = "#ebdbb2"
+  let g:terminal_color_11 = "#d5c4a1"
+  let g:terminal_color_12 = "#665c54"
+  let g:terminal_color_13 = "#3c3836"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index 1ccb376..a9ca074 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f2e5bc"
+  let g:terminal_color_1 =  "#9d0006"
+  let g:terminal_color_2 =  "#79740e"
+  let g:terminal_color_3 =  "#b57614"
+  let g:terminal_color_4 =  "#076678"
+  let g:terminal_color_5 =  "#8f3f71"
+  let g:terminal_color_6 =  "#427b58"
+  let g:terminal_color_7 =  "#504945"
+  let g:terminal_color_8 =  "#bdae93"
+  let g:terminal_color_9 =  "#af3a03"
+  let g:terminal_color_10 = "#ebdbb2"
+  let g:terminal_color_11 = "#d5c4a1"
+  let g:terminal_color_12 = "#665c54"
+  let g:terminal_color_13 = "#3c3836"
+  let g:terminal_color_14 = "#d65d0e"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index 945c1c0..88d60a0 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#0b1c2c"
+  let g:terminal_color_1 =  "#bf8b56"
+  let g:terminal_color_2 =  "#56bf8b"
+  let g:terminal_color_3 =  "#8bbf56"
+  let g:terminal_color_4 =  "#8b56bf"
+  let g:terminal_color_5 =  "#bf568b"
+  let g:terminal_color_6 =  "#568bbf"
+  let g:terminal_color_7 =  "#cbd6e2"
+  let g:terminal_color_8 =  "#627e99"
+  let g:terminal_color_9 =  "#bfbf56"
+  let g:terminal_color_10 = "#223b54"
+  let g:terminal_color_11 = "#405c79"
+  let g:terminal_color_12 = "#aabcce"
+  let g:terminal_color_13 = "#e5ebf1"
+  let g:terminal_color_14 = "#bf5656"
+  let g:terminal_color_15 = "#f7f9fb"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index c8e1d40..c453de9 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f7f9fb"
+  let g:terminal_color_1 =  "#bf8b56"
+  let g:terminal_color_2 =  "#56bf8b"
+  let g:terminal_color_3 =  "#8bbf56"
+  let g:terminal_color_4 =  "#8b56bf"
+  let g:terminal_color_5 =  "#bf568b"
+  let g:terminal_color_6 =  "#568bbf"
+  let g:terminal_color_7 =  "#405c79"
+  let g:terminal_color_8 =  "#aabcce"
+  let g:terminal_color_9 =  "#bfbf56"
+  let g:terminal_color_10 = "#e5ebf1"
+  let g:terminal_color_11 = "#cbd6e2"
+  let g:terminal_color_12 = "#627e99"
+  let g:terminal_color_13 = "#223b54"
+  let g:terminal_color_14 = "#bf5656"
+  let g:terminal_color_15 = "#0b1c2c"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index d01be4c..53c91c8 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#322931"
+  let g:terminal_color_1 =  "#dd464c"
+  let g:terminal_color_2 =  "#8fc13e"
+  let g:terminal_color_3 =  "#fdcc59"
+  let g:terminal_color_4 =  "#1290bf"
+  let g:terminal_color_5 =  "#c85e7c"
+  let g:terminal_color_6 =  "#149b93"
+  let g:terminal_color_7 =  "#b9b5b8"
+  let g:terminal_color_8 =  "#797379"
+  let g:terminal_color_9 =  "#fd8b19"
+  let g:terminal_color_10 = "#433b42"
+  let g:terminal_color_11 = "#5c545b"
+  let g:terminal_color_12 = "#989498"
+  let g:terminal_color_13 = "#d5d3d5"
+  let g:terminal_color_14 = "#b33508"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index ad9a066..6ae7a14 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#ff6c60"
+  let g:terminal_color_2 =  "#a8ff60"
+  let g:terminal_color_3 =  "#ffffb6"
+  let g:terminal_color_4 =  "#96cbfe"
+  let g:terminal_color_5 =  "#ff73fd"
+  let g:terminal_color_6 =  "#c6c5fe"
+  let g:terminal_color_7 =  "#b5b3aa"
+  let g:terminal_color_8 =  "#6c6c66"
+  let g:terminal_color_9 =  "#e9c062"
+  let g:terminal_color_10 = "#242422"
+  let g:terminal_color_11 = "#484844"
+  let g:terminal_color_12 = "#918f88"
+  let g:terminal_color_13 = "#d9d7cc"
+  let g:terminal_color_14 = "#b18a3d"
+  let g:terminal_color_15 = "#fdfbee"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index 13df99a..a9a9155 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#ff0000"
+  let g:terminal_color_2 =  "#33ff00"
+  let g:terminal_color_3 =  "#ff0099"
+  let g:terminal_color_4 =  "#0066ff"
+  let g:terminal_color_5 =  "#cc00ff"
+  let g:terminal_color_6 =  "#00ffff"
+  let g:terminal_color_7 =  "#d0d0d0"
+  let g:terminal_color_8 =  "#808080"
+  let g:terminal_color_9 =  "#ff9900"
+  let g:terminal_color_10 = "#404040"
+  let g:terminal_color_11 = "#606060"
+  let g:terminal_color_12 = "#c0c0c0"
+  let g:terminal_color_13 = "#e0e0e0"
+  let g:terminal_color_14 = "#3300ff"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 6ab5ee0..869a1fb 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#dd0907"
+  let g:terminal_color_2 =  "#1fb714"
+  let g:terminal_color_3 =  "#fbf305"
+  let g:terminal_color_4 =  "#0000d3"
+  let g:terminal_color_5 =  "#4700a5"
+  let g:terminal_color_6 =  "#02abea"
+  let g:terminal_color_7 =  "#c0c0c0"
+  let g:terminal_color_8 =  "#808080"
+  let g:terminal_color_9 =  "#ff6403"
+  let g:terminal_color_10 = "#404040"
+  let g:terminal_color_11 = "#404040"
+  let g:terminal_color_12 = "#808080"
+  let g:terminal_color_13 = "#c0c0c0"
+  let g:terminal_color_14 = "#90713a"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 8204e6f..8e98f91 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#201602"
+  let g:terminal_color_1 =  "#c35359"
+  let g:terminal_color_2 =  "#18974e"
+  let g:terminal_color_3 =  "#a88339"
+  let g:terminal_color_4 =  "#477ca1"
+  let g:terminal_color_5 =  "#8868b3"
+  let g:terminal_color_6 =  "#75a738"
+  let g:terminal_color_7 =  "#948e48"
+  let g:terminal_color_8 =  "#6c6823"
+  let g:terminal_color_9 =  "#b36144"
+  let g:terminal_color_10 = "#302e00"
+  let g:terminal_color_11 = "#5f5b17"
+  let g:terminal_color_12 = "#86813b"
+  let g:terminal_color_13 = "#ccc37a"
+  let g:terminal_color_14 = "#b3588e"
+  let g:terminal_color_15 = "#faf0a5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 6d28c06..9b4317a 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f8f8f8"
+  let g:terminal_color_1 =  "#ab4642"
+  let g:terminal_color_2 =  "#538947"
+  let g:terminal_color_3 =  "#f79a0e"
+  let g:terminal_color_4 =  "#7cafc2"
+  let g:terminal_color_5 =  "#96609e"
+  let g:terminal_color_6 =  "#4b8093"
+  let g:terminal_color_7 =  "#383838"
+  let g:terminal_color_8 =  "#b8b8b8"
+  let g:terminal_color_9 =  "#dc9656"
+  let g:terminal_color_10 = "#e8e8e8"
+  let g:terminal_color_11 = "#d8d8d8"
+  let g:terminal_color_12 = "#585858"
+  let g:terminal_color_13 = "#282828"
+  let g:terminal_color_14 = "#a16946"
+  let g:terminal_color_15 = "#181818"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index a5d8576..f3cf073 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#3B3228"
+  let g:terminal_color_1 =  "#cb6077"
+  let g:terminal_color_2 =  "#beb55b"
+  let g:terminal_color_3 =  "#f4bc87"
+  let g:terminal_color_4 =  "#8ab3b5"
+  let g:terminal_color_5 =  "#a89bb9"
+  let g:terminal_color_6 =  "#7bbda4"
+  let g:terminal_color_7 =  "#d0c8c6"
+  let g:terminal_color_8 =  "#7e705a"
+  let g:terminal_color_9 =  "#d28b71"
+  let g:terminal_color_10 = "#534636"
+  let g:terminal_color_11 = "#645240"
+  let g:terminal_color_12 = "#b8afad"
+  let g:terminal_color_13 = "#e9e1dd"
+  let g:terminal_color_14 = "#bb9584"
+  let g:terminal_color_15 = "#f5eeeb"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 5bd5195..9cc7dfc 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#272822"
+  let g:terminal_color_1 =  "#f92672"
+  let g:terminal_color_2 =  "#a6e22e"
+  let g:terminal_color_3 =  "#f4bf75"
+  let g:terminal_color_4 =  "#66d9ef"
+  let g:terminal_color_5 =  "#ae81ff"
+  let g:terminal_color_6 =  "#a1efe4"
+  let g:terminal_color_7 =  "#f8f8f2"
+  let g:terminal_color_8 =  "#75715e"
+  let g:terminal_color_9 =  "#fd971f"
+  let g:terminal_color_10 = "#383830"
+  let g:terminal_color_11 = "#49483e"
+  let g:terminal_color_12 = "#a59f85"
+  let g:terminal_color_13 = "#f5f4f1"
+  let g:terminal_color_14 = "#cc6633"
+  let g:terminal_color_15 = "#f9f8f5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
new file mode 100644
index 0000000..f49c0ce
--- /dev/null
+++ b/colors/base16-nord.vim
@@ -0,0 +1,327 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Nord scheme by arcticicestudio
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has('gui_running')
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-nord.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00 = "2E3440"
+let s:gui01 = "3B4252"
+let s:gui02 = "434C5E"
+let s:gui03 = "4C566A"
+let s:gui04 = "D8DEE9"
+let s:gui05 = "E5E9F0"
+let s:gui06 = "ECEFF4"
+let s:gui07 = "8FBCBB"
+let s:gui08 = "88C0D0"
+let s:gui09 = "81A1C1"
+let s:gui0A = "5E81AC"
+let s:gui0B = "BF616A"
+let s:gui0C = "D08770"
+let s:gui0D = "EBCB8B"
+let s:gui0E = "A3BE8C"
+let s:gui0F = "B48EAD"
+
+" Terminal color definitions
+let s:cterm00 = "00"
+let s:cterm03 = "08"
+let s:cterm05 = "07"
+let s:cterm07 = "15"
+let s:cterm08 = "01"
+let s:cterm0A = "03"
+let s:cterm0B = "02"
+let s:cterm0C = "06"
+let s:cterm0D = "04"
+let s:cterm0E = "05"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "10"
+  let s:cterm02 = "11"
+  let s:cterm04 = "12"
+  let s:cterm06 = "13"
+  let s:cterm09 = "09"
+  let s:cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2E3440"
+  let g:terminal_color_1 =  "#88C0D0"
+  let g:terminal_color_2 =  "#BF616A"
+  let g:terminal_color_3 =  "#5E81AC"
+  let g:terminal_color_4 =  "#EBCB8B"
+  let g:terminal_color_5 =  "#A3BE8C"
+  let g:terminal_color_6 =  "#D08770"
+  let g:terminal_color_7 =  "#E5E9F0"
+  let g:terminal_color_8 =  "#4C566A"
+  let g:terminal_color_9 =  "#81A1C1"
+  let g:terminal_color_10 = "#3B4252"
+  let g:terminal_color_11 = "#434C5E"
+  let g:terminal_color_12 = "#D8DEE9"
+  let g:terminal_color_13 = "#ECEFF4"
+  let g:terminal_color_14 = "#B48EAD"
+  let g:terminal_color_15 = "#8FBCBB"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-nord"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . a:guifg
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . a:guibg
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+  if a:guisp != ""
+    exec "hi " . a:group . " guisp=#" . a:guisp
+  endif
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui03, s:gui0A, s:cterm03, s:cterm0A,  "", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" C highlighting
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" Diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git highlighting
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript highlighting
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index f28619b..a481ef3 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2b303b"
+  let g:terminal_color_1 =  "#bf616a"
+  let g:terminal_color_2 =  "#a3be8c"
+  let g:terminal_color_3 =  "#ebcb8b"
+  let g:terminal_color_4 =  "#8fa1b3"
+  let g:terminal_color_5 =  "#b48ead"
+  let g:terminal_color_6 =  "#96b5b4"
+  let g:terminal_color_7 =  "#c0c5ce"
+  let g:terminal_color_8 =  "#65737e"
+  let g:terminal_color_9 =  "#d08770"
+  let g:terminal_color_10 = "#343d46"
+  let g:terminal_color_11 = "#4f5b66"
+  let g:terminal_color_12 = "#a7adba"
+  let g:terminal_color_13 = "#dfe1e8"
+  let g:terminal_color_14 = "#ab7967"
+  let g:terminal_color_15 = "#eff1f5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index ee32836..2df8ae0 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1B2B34"
+  let g:terminal_color_1 =  "#EC5f67"
+  let g:terminal_color_2 =  "#99C794"
+  let g:terminal_color_3 =  "#FAC863"
+  let g:terminal_color_4 =  "#6699CC"
+  let g:terminal_color_5 =  "#C594C5"
+  let g:terminal_color_6 =  "#5FB3B3"
+  let g:terminal_color_7 =  "#C0C5CE"
+  let g:terminal_color_8 =  "#65737E"
+  let g:terminal_color_9 =  "#F99157"
+  let g:terminal_color_10 = "#343D46"
+  let g:terminal_color_11 = "#4F5B66"
+  let g:terminal_color_12 = "#A7ADBA"
+  let g:terminal_color_13 = "#CDD3DE"
+  let g:terminal_color_14 = "#AB7967"
+  let g:terminal_color_15 = "#D8DEE9"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index b1eece9..c7fd141 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#282c34"
+  let g:terminal_color_1 =  "#e06c75"
+  let g:terminal_color_2 =  "#98c379"
+  let g:terminal_color_3 =  "#e5c07b"
+  let g:terminal_color_4 =  "#61afef"
+  let g:terminal_color_5 =  "#c678dd"
+  let g:terminal_color_6 =  "#56b6c2"
+  let g:terminal_color_7 =  "#abb2bf"
+  let g:terminal_color_8 =  "#545862"
+  let g:terminal_color_9 =  "#d19a66"
+  let g:terminal_color_10 = "#353b45"
+  let g:terminal_color_11 = "#3e4451"
+  let g:terminal_color_12 = "#565c64"
+  let g:terminal_color_13 = "#b6bdca"
+  let g:terminal_color_14 = "#be5046"
+  let g:terminal_color_15 = "#c8ccd4"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index 0a477f3..b378ccf 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2f1e2e"
+  let g:terminal_color_1 =  "#ef6155"
+  let g:terminal_color_2 =  "#48b685"
+  let g:terminal_color_3 =  "#fec418"
+  let g:terminal_color_4 =  "#06b6ef"
+  let g:terminal_color_5 =  "#815ba4"
+  let g:terminal_color_6 =  "#5bc4bf"
+  let g:terminal_color_7 =  "#a39e9b"
+  let g:terminal_color_8 =  "#776e71"
+  let g:terminal_color_9 =  "#f99b15"
+  let g:terminal_color_10 = "#41323f"
+  let g:terminal_color_11 = "#4f424c"
+  let g:terminal_color_12 = "#8d8687"
+  let g:terminal_color_13 = "#b9b6b0"
+  let g:terminal_color_14 = "#e96ba8"
+  let g:terminal_color_15 = "#e7e9db"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index 88bedd8..d6a728b 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#061229"
+  let g:terminal_color_1 =  "#d07346"
+  let g:terminal_color_2 =  "#99bf52"
+  let g:terminal_color_3 =  "#fbd461"
+  let g:terminal_color_4 =  "#5299bf"
+  let g:terminal_color_5 =  "#9989cc"
+  let g:terminal_color_6 =  "#72b9bf"
+  let g:terminal_color_7 =  "#b8bbc2"
+  let g:terminal_color_8 =  "#717885"
+  let g:terminal_color_9 =  "#f0a000"
+  let g:terminal_color_10 = "#2a3448"
+  let g:terminal_color_11 = "#4d5666"
+  let g:terminal_color_12 = "#9a99a3"
+  let g:terminal_color_13 = "#dbdde0"
+  let g:terminal_color_14 = "#b08060"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index 13330fe..927b8ab 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#ff004d"
+  let g:terminal_color_2 =  "#00e756"
+  let g:terminal_color_3 =  "#fff024"
+  let g:terminal_color_4 =  "#83769c"
+  let g:terminal_color_5 =  "#ff77a8"
+  let g:terminal_color_6 =  "#29adff"
+  let g:terminal_color_7 =  "#5f574f"
+  let g:terminal_color_8 =  "#008751"
+  let g:terminal_color_9 =  "#ffa300"
+  let g:terminal_color_10 = "#1d2b53"
+  let g:terminal_color_11 = "#7e2553"
+  let g:terminal_color_12 = "#ab5236"
+  let g:terminal_color_13 = "#c2c3c7"
+  let g:terminal_color_14 = "#ffccaa"
+  let g:terminal_color_15 = "#fff1e8"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index c9e3b6e..4289e2b 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#eb008a"
+  let g:terminal_color_2 =  "#37b349"
+  let g:terminal_color_3 =  "#f8ca12"
+  let g:terminal_color_4 =  "#0e5a94"
+  let g:terminal_color_5 =  "#b31e8d"
+  let g:terminal_color_6 =  "#00aabb"
+  let g:terminal_color_7 =  "#d0d0d0"
+  let g:terminal_color_8 =  "#505050"
+  let g:terminal_color_9 =  "#f29333"
+  let g:terminal_color_10 = "#202020"
+  let g:terminal_color_11 = "#303030"
+  let g:terminal_color_12 = "#b0b0b0"
+  let g:terminal_color_13 = "#e0e0e0"
+  let g:terminal_color_14 = "#7a2d00"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 0d0246c..0cc79f7 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2b2b2b"
+  let g:terminal_color_1 =  "#da4939"
+  let g:terminal_color_2 =  "#a5c261"
+  let g:terminal_color_3 =  "#ffc66d"
+  let g:terminal_color_4 =  "#6d9cbe"
+  let g:terminal_color_5 =  "#b6b3eb"
+  let g:terminal_color_6 =  "#519f50"
+  let g:terminal_color_7 =  "#e6e1dc"
+  let g:terminal_color_8 =  "#5a647e"
+  let g:terminal_color_9 =  "#cc7833"
+  let g:terminal_color_10 = "#272935"
+  let g:terminal_color_11 = "#3a4055"
+  let g:terminal_color_12 = "#d4cfc9"
+  let g:terminal_color_13 = "#f4f1ed"
+  let g:terminal_color_14 = "#bc9458"
+  let g:terminal_color_15 = "#f9f7f3"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
new file mode 100644
index 0000000..6310a93
--- /dev/null
+++ b/colors/base16-rebecca.vim
@@ -0,0 +1,327 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Rebecca scheme by Victor Borja (http://github.com/vic) based on Rebecca Theme (http://github.com/vic/rebecca-theme)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has('gui_running')
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-rebecca.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00 = "292a44"
+let s:gui01 = "663399"
+let s:gui02 = "383a62"
+let s:gui03 = "666699"
+let s:gui04 = "a0a0c5"
+let s:gui05 = "f1eff8"
+let s:gui06 = "ccccff"
+let s:gui07 = "53495d"
+let s:gui08 = "a0a0c5"
+let s:gui09 = "efe4a1"
+let s:gui0A = "ae81ff"
+let s:gui0B = "6dfedf"
+let s:gui0C = "8eaee0"
+let s:gui0D = "2de0a7"
+let s:gui0E = "7aa5ff"
+let s:gui0F = "ff79c6"
+
+" Terminal color definitions
+let s:cterm00 = "00"
+let s:cterm03 = "08"
+let s:cterm05 = "07"
+let s:cterm07 = "15"
+let s:cterm08 = "01"
+let s:cterm0A = "03"
+let s:cterm0B = "02"
+let s:cterm0C = "06"
+let s:cterm0D = "04"
+let s:cterm0E = "05"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "10"
+  let s:cterm02 = "11"
+  let s:cterm04 = "12"
+  let s:cterm06 = "13"
+  let s:cterm09 = "09"
+  let s:cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#292a44"
+  let g:terminal_color_1 =  "#a0a0c5"
+  let g:terminal_color_2 =  "#6dfedf"
+  let g:terminal_color_3 =  "#ae81ff"
+  let g:terminal_color_4 =  "#2de0a7"
+  let g:terminal_color_5 =  "#7aa5ff"
+  let g:terminal_color_6 =  "#8eaee0"
+  let g:terminal_color_7 =  "#f1eff8"
+  let g:terminal_color_8 =  "#666699"
+  let g:terminal_color_9 =  "#efe4a1"
+  let g:terminal_color_10 = "#663399"
+  let g:terminal_color_11 = "#383a62"
+  let g:terminal_color_12 = "#a0a0c5"
+  let g:terminal_color_13 = "#ccccff"
+  let g:terminal_color_14 = "#ff79c6"
+  let g:terminal_color_15 = "#53495d"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-rebecca"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . a:guifg
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . a:guibg
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+  if a:guisp != ""
+    exec "hi " . a:group . " guisp=#" . a:guisp
+  endif
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui03, s:gui0A, s:cterm03, s:cterm0A,  "", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" C highlighting
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" Diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git highlighting
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript highlighting
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index c6dd87e..0c59846 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#151718"
+  let g:terminal_color_1 =  "#Cd3f45"
+  let g:terminal_color_2 =  "#9fca56"
+  let g:terminal_color_3 =  "#e6cd69"
+  let g:terminal_color_4 =  "#55b5db"
+  let g:terminal_color_5 =  "#a074c4"
+  let g:terminal_color_6 =  "#55dbbe"
+  let g:terminal_color_7 =  "#d6d6d6"
+  let g:terminal_color_8 =  "#41535B"
+  let g:terminal_color_9 =  "#db7b55"
+  let g:terminal_color_10 = "#8ec43d"
+  let g:terminal_color_11 = "#3B758C"
+  let g:terminal_color_12 = "#43a5d5"
+  let g:terminal_color_13 = "#eeeeee"
+  let g:terminal_color_14 = "#8a553f"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index b8640b3..ecb7285 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f9f9f9"
+  let g:terminal_color_1 =  "#e92f2f"
+  let g:terminal_color_2 =  "#0ed839"
+  let g:terminal_color_3 =  "#dddd13"
+  let g:terminal_color_4 =  "#3b48e3"
+  let g:terminal_color_5 =  "#f996e2"
+  let g:terminal_color_6 =  "#23edda"
+  let g:terminal_color_7 =  "#102015"
+  let g:terminal_color_8 =  "#555555"
+  let g:terminal_color_9 =  "#e09448"
+  let g:terminal_color_10 = "#e0e0e0"
+  let g:terminal_color_11 = "#ababab"
+  let g:terminal_color_12 = "#343434"
+  let g:terminal_color_13 = "#040404"
+  let g:terminal_color_14 = "#69542d"
+  let g:terminal_color_15 = "#000000"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index d876c95..dbcaa0f 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#18262F"
+  let g:terminal_color_1 =  "#EF5253"
+  let g:terminal_color_2 =  "#7CC844"
+  let g:terminal_color_3 =  "#E4B51C"
+  let g:terminal_color_4 =  "#33B5E1"
+  let g:terminal_color_5 =  "#A363D5"
+  let g:terminal_color_6 =  "#52CBB0"
+  let g:terminal_color_7 =  "#A6AFB8"
+  let g:terminal_color_8 =  "#667581"
+  let g:terminal_color_9 =  "#E66B2B"
+  let g:terminal_color_10 = "#222E38"
+  let g:terminal_color_11 = "#586875"
+  let g:terminal_color_12 = "#85939E"
+  let g:terminal_color_13 = "#E8E9ED"
+  let g:terminal_color_14 = "#D73C9A"
+  let g:terminal_color_15 = "#F5F7FA"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 7593b10..ff3c81a 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#002b36"
+  let g:terminal_color_1 =  "#dc322f"
+  let g:terminal_color_2 =  "#859900"
+  let g:terminal_color_3 =  "#b58900"
+  let g:terminal_color_4 =  "#268bd2"
+  let g:terminal_color_5 =  "#6c71c4"
+  let g:terminal_color_6 =  "#2aa198"
+  let g:terminal_color_7 =  "#93a1a1"
+  let g:terminal_color_8 =  "#657b83"
+  let g:terminal_color_9 =  "#cb4b16"
+  let g:terminal_color_10 = "#073642"
+  let g:terminal_color_11 = "#586e75"
+  let g:terminal_color_12 = "#839496"
+  let g:terminal_color_13 = "#eee8d5"
+  let g:terminal_color_14 = "#d33682"
+  let g:terminal_color_15 = "#fdf6e3"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index dd37ba1..8852523 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fdf6e3"
+  let g:terminal_color_1 =  "#dc322f"
+  let g:terminal_color_2 =  "#859900"
+  let g:terminal_color_3 =  "#b58900"
+  let g:terminal_color_4 =  "#268bd2"
+  let g:terminal_color_5 =  "#6c71c4"
+  let g:terminal_color_6 =  "#2aa198"
+  let g:terminal_color_7 =  "#586e75"
+  let g:terminal_color_8 =  "#839496"
+  let g:terminal_color_9 =  "#cb4b16"
+  let g:terminal_color_10 = "#eee8d5"
+  let g:terminal_color_11 = "#93a1a1"
+  let g:terminal_color_12 = "#657b83"
+  let g:terminal_color_13 = "#073642"
+  let g:terminal_color_14 = "#d33682"
+  let g:terminal_color_15 = "#002b36"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 5bf70d0..2358b2a 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1f2022"
+  let g:terminal_color_1 =  "#f2241f"
+  let g:terminal_color_2 =  "#67b11d"
+  let g:terminal_color_3 =  "#b1951d"
+  let g:terminal_color_4 =  "#4f97d7"
+  let g:terminal_color_5 =  "#a31db1"
+  let g:terminal_color_6 =  "#2d9574"
+  let g:terminal_color_7 =  "#a3a3a3"
+  let g:terminal_color_8 =  "#585858"
+  let g:terminal_color_9 =  "#ffa500"
+  let g:terminal_color_10 = "#282828"
+  let g:terminal_color_11 = "#444155"
+  let g:terminal_color_12 = "#b8b8b8"
+  let g:terminal_color_13 = "#e8e8e8"
+  let g:terminal_color_14 = "#b03060"
+  let g:terminal_color_15 = "#f8f8f8"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 06dc3bb..a0e19a9 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#151515"
+  let g:terminal_color_1 =  "#FF0086"
+  let g:terminal_color_2 =  "#00C918"
+  let g:terminal_color_3 =  "#ABA800"
+  let g:terminal_color_4 =  "#3777E6"
+  let g:terminal_color_5 =  "#AD00A1"
+  let g:terminal_color_6 =  "#1FAAAA"
+  let g:terminal_color_7 =  "#D0D0D0"
+  let g:terminal_color_8 =  "#505050"
+  let g:terminal_color_9 =  "#FD8900"
+  let g:terminal_color_10 = "#202020"
+  let g:terminal_color_11 = "#303030"
+  let g:terminal_color_12 = "#B0B0B0"
+  let g:terminal_color_13 = "#E0E0E0"
+  let g:terminal_color_14 = "#CC6633"
+  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 6d7019f..8f8bc69 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#FFFFFF"
+  let g:terminal_color_1 =  "#FF0086"
+  let g:terminal_color_2 =  "#00C918"
+  let g:terminal_color_3 =  "#ABA800"
+  let g:terminal_color_4 =  "#3777E6"
+  let g:terminal_color_5 =  "#AD00A1"
+  let g:terminal_color_6 =  "#1FAAAA"
+  let g:terminal_color_7 =  "#101010"
+  let g:terminal_color_8 =  "#B0B0B0"
+  let g:terminal_color_9 =  "#FD8900"
+  let g:terminal_color_10 = "#E0E0E0"
+  let g:terminal_color_11 = "#D0D0D0"
+  let g:terminal_color_12 = "#000000"
+  let g:terminal_color_13 = "#151515"
+  let g:terminal_color_14 = "#CC6633"
+  let g:terminal_color_15 = "#202020"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 7f829cd..b4aba43 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1d1f21"
+  let g:terminal_color_1 =  "#cc6666"
+  let g:terminal_color_2 =  "#b5bd68"
+  let g:terminal_color_3 =  "#f0c674"
+  let g:terminal_color_4 =  "#81a2be"
+  let g:terminal_color_5 =  "#b294bb"
+  let g:terminal_color_6 =  "#8abeb7"
+  let g:terminal_color_7 =  "#c5c8c6"
+  let g:terminal_color_8 =  "#969896"
+  let g:terminal_color_9 =  "#de935f"
+  let g:terminal_color_10 = "#282a2e"
+  let g:terminal_color_11 = "#373b41"
+  let g:terminal_color_12 = "#b4b7b4"
+  let g:terminal_color_13 = "#e0e0e0"
+  let g:terminal_color_14 = "#a3685a"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 8b0d037..a26ab69 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#c82829"
+  let g:terminal_color_2 =  "#718c00"
+  let g:terminal_color_3 =  "#eab700"
+  let g:terminal_color_4 =  "#4271ae"
+  let g:terminal_color_5 =  "#8959a8"
+  let g:terminal_color_6 =  "#3e999f"
+  let g:terminal_color_7 =  "#4d4d4c"
+  let g:terminal_color_8 =  "#8e908c"
+  let g:terminal_color_9 =  "#f5871f"
+  let g:terminal_color_10 = "#e0e0e0"
+  let g:terminal_color_11 = "#d6d6d6"
+  let g:terminal_color_12 = "#969896"
+  let g:terminal_color_13 = "#282a2e"
+  let g:terminal_color_14 = "#a3685a"
+  let g:terminal_color_15 = "#1d1f21"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index ba92545..8313f6f 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#231f20"
+  let g:terminal_color_1 =  "#ee2e24"
+  let g:terminal_color_2 =  "#00853e"
+  let g:terminal_color_3 =  "#ffd204"
+  let g:terminal_color_4 =  "#009ddc"
+  let g:terminal_color_5 =  "#98005d"
+  let g:terminal_color_6 =  "#85cebc"
+  let g:terminal_color_7 =  "#d9d8d8"
+  let g:terminal_color_8 =  "#737171"
+  let g:terminal_color_9 =  "#f386a1"
+  let g:terminal_color_10 = "#1c3f95"
+  let g:terminal_color_11 = "#5a5758"
+  let g:terminal_color_12 = "#959ca1"
+  let g:terminal_color_13 = "#e7e7e8"
+  let g:terminal_color_14 = "#b06110"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index a775b83..1f54c87 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1e1e1e"
+  let g:terminal_color_1 =  "#cf6a4c"
+  let g:terminal_color_2 =  "#8f9d6a"
+  let g:terminal_color_3 =  "#f9ee98"
+  let g:terminal_color_4 =  "#7587a6"
+  let g:terminal_color_5 =  "#9b859d"
+  let g:terminal_color_6 =  "#afc4db"
+  let g:terminal_color_7 =  "#a7a7a7"
+  let g:terminal_color_8 =  "#5f5a60"
+  let g:terminal_color_9 =  "#cda869"
+  let g:terminal_color_10 = "#323537"
+  let g:terminal_color_11 = "#464b50"
+  let g:terminal_color_12 = "#838184"
+  let g:terminal_color_13 = "#c3c3c3"
+  let g:terminal_color_14 = "#9b703f"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index 58b4154..750e1bd 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2e2a31"
+  let g:terminal_color_1 =  "#d8137f"
+  let g:terminal_color_2 =  "#17ad98"
+  let g:terminal_color_3 =  "#dc8a0e"
+  let g:terminal_color_4 =  "#796af5"
+  let g:terminal_color_5 =  "#bb60ea"
+  let g:terminal_color_6 =  "#149bda"
+  let g:terminal_color_7 =  "#bcbabe"
+  let g:terminal_color_8 =  "#838085"
+  let g:terminal_color_9 =  "#d65407"
+  let g:terminal_color_10 = "#4a464d"
+  let g:terminal_color_11 = "#666369"
+  let g:terminal_color_12 = "#9f9da2"
+  let g:terminal_color_13 = "#d8d7da"
+  let g:terminal_color_14 = "#c720ca"
+  let g:terminal_color_15 = "#f5f4f7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 7161c2e..fe59c3f 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#d8137f"
+  let g:terminal_color_2 =  "#17ad98"
+  let g:terminal_color_3 =  "#dc8a0e"
+  let g:terminal_color_4 =  "#775dff"
+  let g:terminal_color_5 =  "#aa17e6"
+  let g:terminal_color_6 =  "#149bda"
+  let g:terminal_color_7 =  "#6c696e"
+  let g:terminal_color_8 =  "#a7a5a8"
+  let g:terminal_color_9 =  "#d65407"
+  let g:terminal_color_10 = "#e1e1e2"
+  let g:terminal_color_11 = "#c4c3c5"
+  let g:terminal_color_12 = "#89878b"
+  let g:terminal_color_13 = "#4f4b51"
+  let g:terminal_color_14 = "#e013d0"
+  let g:terminal_color_15 = "#322d34"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index 89be2fa..30ef33f 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -59,6 +59,32 @@ else
   let s:cterm0F = "14"
 endif
 
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#231e18"
+  let g:terminal_color_1 =  "#d35c5c"
+  let g:terminal_color_2 =  "#b7ba53"
+  let g:terminal_color_3 =  "#e0ac16"
+  let g:terminal_color_4 =  "#88a4d3"
+  let g:terminal_color_5 =  "#bb90e2"
+  let g:terminal_color_6 =  "#6eb958"
+  let g:terminal_color_7 =  "#cabcb1"
+  let g:terminal_color_8 =  "#9d8b70"
+  let g:terminal_color_9 =  "#ca7f32"
+  let g:terminal_color_10 = "#302b25"
+  let g:terminal_color_11 = "#48413a"
+  let g:terminal_color_12 = "#b4a490"
+  let g:terminal_color_13 = "#d7c8bc"
+  let g:terminal_color_14 = "#b49368"
+  let g:terminal_color_15 = "#e4d4c8"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_7
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+endif
+
 " Theme setup
 hi clear
 syntax reset