diff --git a/colors/Tomorrow-Night-Blue.vim b/colors/Tomorrow-Night-Blue.vim
index 075e0d0..a49313d 100644
--- a/colors/Tomorrow-Night-Blue.vim
+++ b/colors/Tomorrow-Night-Blue.vim
@@ -233,17 +233,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
 	" Vim Highlighting
 	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:foreground, "", "")
+	call <SID>X("LineNr", s:foreground, s:line, "")
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
 	call <SID>X("Search", s:background, s:yellow, "")
 	call <SID>X("TabLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
+	call <SID>X("VertSplit", s:foreground, s:foreground, "")
 	call <SID>X("Visual", "", s:selection, "")
 	call <SID>X("Directory", s:blue, "", "")
 	call <SID>X("ModeMsg", s:green, "", "")
-    call <SID>X("MoreMsg", s:green, "", "")
+	call <SID>X("MoreMsg", s:green, "", "")
 	call <SID>X("Question", s:green, "", "")
 	call <SID>X("WarningMsg", s:red, "", "")
 	if version >= 700
@@ -252,7 +253,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 		call <SID>X("PMenu", s:foreground, s:selection, "none")
 		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
 	end
-  if version >= 703
+	if version >= 703
 		call <SID>X("ColorColumn", "", s:line, "none")
 	end
 
diff --git a/colors/Tomorrow-Night-Bright.vim b/colors/Tomorrow-Night-Bright.vim
index a7fc2c6..5e8e173 100644
--- a/colors/Tomorrow-Night-Bright.vim
+++ b/colors/Tomorrow-Night-Bright.vim
@@ -233,17 +233,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
 	" Vim Highlighting
 	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:foreground, "", "")
+	call <SID>X("LineNr", s:foreground, s:line, "")
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
 	call <SID>X("Search", s:background, s:yellow, "")
 	call <SID>X("TabLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
+	call <SID>X("VertSplit", s:foreground, s:foreground, "")
 	call <SID>X("Visual", "", s:selection, "")
 	call <SID>X("Directory", s:blue, "", "")
 	call <SID>X("ModeMsg", s:green, "", "")
-    call <SID>X("MoreMsg", s:green, "", "")
+	call <SID>X("MoreMsg", s:green, "", "")
 	call <SID>X("Question", s:green, "", "")
 	call <SID>X("WarningMsg", s:red, "", "")
 	if version >= 700
@@ -252,7 +253,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 		call <SID>X("PMenu", s:foreground, s:selection, "none")
 		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
 	end
-  if version >= 703
+	if version >= 703
 		call <SID>X("ColorColumn", "", s:line, "none")
 	end
 
diff --git a/colors/Tomorrow-Night-Eighties.vim b/colors/Tomorrow-Night-Eighties.vim
index c18743e..721a84b 100644
--- a/colors/Tomorrow-Night-Eighties.vim
+++ b/colors/Tomorrow-Night-Eighties.vim
@@ -233,17 +233,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
 	" Vim Highlighting
 	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:foreground, "", "")
+	call <SID>X("LineNr", s:foreground, s:line, "")
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
 	call <SID>X("Search", s:background, s:yellow, "")
 	call <SID>X("TabLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
+	call <SID>X("VertSplit", s:foreground, s:foreground, "")
 	call <SID>X("Visual", "", s:selection, "")
 	call <SID>X("Directory", s:blue, "", "")
 	call <SID>X("ModeMsg", s:green, "", "")
-    call <SID>X("MoreMsg", s:green, "", "")
+	call <SID>X("MoreMsg", s:green, "", "")
 	call <SID>X("Question", s:green, "", "")
 	call <SID>X("WarningMsg", s:red, "", "")
 	if version >= 700
@@ -252,7 +253,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 		call <SID>X("PMenu", s:foreground, s:selection, "none")
 		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
 	end
-  if version >= 703
+	if version >= 703
 		call <SID>X("ColorColumn", "", s:line, "none")
 	end
 
diff --git a/colors/Tomorrow-Night.vim b/colors/Tomorrow-Night.vim
index 4fc9ebe..a286571 100644
--- a/colors/Tomorrow-Night.vim
+++ b/colors/Tomorrow-Night.vim
@@ -16,10 +16,12 @@ let s:green = "b5bd68"
 let s:aqua = "8abeb7"
 let s:blue = "81a2be"
 let s:purple = "b294bb"
+let s:window = "4d5057"
 
 " Console 256 Colours
 if !has("gui_running")
 	let s:background = "303030"
+	let s:window = "5e5e5e"
 	let s:line = "3a3a3a"
 	let s:selection = "585858"
 end
@@ -240,17 +242,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
 	" Vim Highlighting
 	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:foreground, "", "")
+	call <SID>X("LineNr", s:foreground, s:line, "")
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
 	call <SID>X("Search", s:background, s:yellow, "")
 	call <SID>X("TabLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
+	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
+	call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
+	call <SID>X("VertSplit", s:window, s:window, "none")
 	call <SID>X("Visual", "", s:selection, "")
 	call <SID>X("Directory", s:blue, "", "")
 	call <SID>X("ModeMsg", s:green, "", "")
-    call <SID>X("MoreMsg", s:green, "", "")
+	call <SID>X("MoreMsg", s:green, "", "")
 	call <SID>X("Question", s:green, "", "")
 	call <SID>X("WarningMsg", s:red, "", "")
 	if version >= 700
@@ -259,7 +262,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 		call <SID>X("PMenu", s:foreground, s:selection, "none")
 		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
 	end
-  if version >= 703
+	if version >= 703
 		call <SID>X("ColorColumn", "", s:line, "none")
 	end
 
diff --git a/colors/Tomorrow.vim b/colors/Tomorrow.vim
index 88d3a33..b2d0e34 100644
--- a/colors/Tomorrow.vim
+++ b/colors/Tomorrow.vim
@@ -232,17 +232,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
 	" Vim Highlighting
 	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:foreground, "", "")
+	call <SID>X("LineNr", s:foreground, s:line, "")
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
 	call <SID>X("Search", s:background, s:yellow, "")
 	call <SID>X("TabLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLine", s:foreground, s:background, "reverse")
 	call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
+	call <SID>X("VertSplit", s:foreground, s:foreground, "")
 	call <SID>X("Visual", "", s:selection, "")
 	call <SID>X("Directory", s:blue, "", "")
 	call <SID>X("ModeMsg", s:green, "", "")
-    call <SID>X("MoreMsg", s:green, "", "")
+	call <SID>X("MoreMsg", s:green, "", "")
 	call <SID>X("Question", s:green, "", "")
 	call <SID>X("WarningMsg", s:red, "", "")
 	if version >= 700
@@ -251,7 +252,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 		call <SID>X("PMenu", s:foreground, s:selection, "none")
 		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
 	end
-  if version >= 703
+	if version >= 703
 		call <SID>X("ColorColumn", "", s:line, "none")
 	end