21 files changed, 336 insertions, 336 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 7722024..55e0bbe 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -20,16 +20,16 @@ let s:gui0E = "a16a94"
 let s:gui0F = "cdab53"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim
index ec61d89..7e25490 100644
--- a/colors/base16-atelierdune.vim
+++ b/colors/base16-atelierdune.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b854d4"
 let s:gui0F = "d43552"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim
index f10805d..447f9b7 100644
--- a/colors/base16-atelierforest.vim
+++ b/colors/base16-atelierforest.vim
@@ -20,16 +20,16 @@ let s:gui0E = "6666ea"
 let s:gui0F = "c33ff3"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim
index 9d9e370..7354d57 100644
--- a/colors/base16-atelierheath.vim
+++ b/colors/base16-atelierheath.vim
@@ -20,16 +20,16 @@ let s:gui0E = "7b59c0"
 let s:gui0F = "cc33cc"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim
index 7774896..37da475 100644
--- a/colors/base16-atelierlakeside.vim
+++ b/colors/base16-atelierlakeside.vim
@@ -20,16 +20,16 @@ let s:gui0E = "5d5db1"
 let s:gui0F = "b72dd2"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim
index 7841ed4..a37c21a 100644
--- a/colors/base16-atelierseaside.vim
+++ b/colors/base16-atelierseaside.vim
@@ -20,16 +20,16 @@ let s:gui0E = "ad2bee"
 let s:gui0F = "e619c3"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 5639d22..f272158 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -20,16 +20,16 @@ let s:gui0E = "e1a3ee"
 let s:gui0F = "deaf8f"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index cc78a6d..09e0310 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -20,16 +20,16 @@ let s:gui0E = "aa759f"
 let s:gui0F = "8f5536"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 8fcb1fe..ba18b41 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -20,16 +20,16 @@ let s:gui0E = "cc99cc"
 let s:gui0F = "d27b53"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index f1f7b09..d9aa7c7 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -20,16 +20,16 @@ let s:gui0E = "9B59B6"
 let s:gui0F = "be643c"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim
index 10e52b8..c443b88 100644
--- a/colors/base16-grayscale.vim
+++ b/colors/base16-grayscale.vim
@@ -20,16 +20,16 @@ let s:gui0E = "747474"
 let s:gui0F = "5e5e5e"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index f633e92..3d368d9 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -20,16 +20,16 @@ let s:gui0E = "00bb00"
 let s:gui0F = "005500"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index b09fe10..eb16c8f 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -20,16 +20,16 @@ let s:gui0E = "8868b3"
 let s:gui0F = "b3588e"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index bae7f76..2eea8bf 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -20,16 +20,16 @@ let s:gui0E = "a89bb9"
 let s:gui0F = "bb9584"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index a69c41f..4389909 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -20,16 +20,16 @@ let s:gui0E = "ae81ff"
 let s:gui0F = "cc6633"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index a51942e..0448ade 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b48ead"
 let s:gui0F = "ab7967"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index a92f004..dc8cee8 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b6b3eb"
 let s:gui0F = "bc9458"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 6220367..3c3f7e3 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -20,16 +20,16 @@ let s:gui0E = "f996e2"
 let s:gui0F = "69542d"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index d491f08..a5ed7fb 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -20,16 +20,16 @@ let s:gui0E = "6c71c4"
 let s:gui0F = "d33682"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 3093cfb..05b9ee7 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b294bb"
 let s:gui0F = "a3685a"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 97f524d..1fa4e86 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -20,16 +20,16 @@ let s:gui0E = "9b859d"
 let s:gui0F = "9b703f"
 
 " Terminal color definitions
-let s:cterm00 = "Black"
-let s:cterm03 = "DarkGray"
-let s:cterm05 = "Gray"
-let s:cterm07 = "White"
-let s:cterm08 = "DarkRed"
-let s:cterm0A = "Brown"
-let s:cterm0B = "DarkGreen"
-let s:cterm0C = "DarkCyan"
-let s:cterm0D = "DarkBlue"
-let s:cterm0E = "DarkMagenta"
+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"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "Green"
-  let s:cterm02 = "Yellow"
-  let s:cterm04 = "Blue"
-  let s:cterm06 = "Magenta"
-  let s:cterm09 = "Red"
-  let s:cterm0F = "Cyan"
+  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
 
 " Theme setup