Tweaked colours a little bit

Tweaked colours a little bit, removed unnecessary highlights (unnecessary to me, that is), also added in a bit of information and arranged the "if version" portion.

pinkwinter.vim

@@ -1,102 +1,105 @@
-" Vim color file - pinkwinter
-" Generated by http://bytefluent.com/vivify 2015-02-22
-set background=dark
-if version > 580
-	hi clear
+" Vim color file 
+"
+"
+" Name:               NeonWave
+" Author:             SacredCrumb
+" Date:               22-03-15 
+" Initial Conception: 02-22-15
+"
+"
+" Just as a side note, themes like these are generally what happens
+" when you go off on Vaporwave binges >.>
+
+
+
+" Huge, HUGE thank you to ByteFluent for the creation of Vivify!!
+" Without this site it would have been far more troublesome to
+" get a working theme going, as well as the inertia to get going.
+" That is to say, without having seen the names associated with the
+" highlights. 
+"
+" http://bytefluent.com/vivify 
+
+
+" I'm sure this theme will work for *some* Vim versions below 7.0,
+" but I can't be sure.
+if v:version >= 700
 	if exists("syntax_on")
+		set t_Co=256
+		set background=dark
 		syntax reset
+		hi clear
+		let g:colors_name = "neonwave"
+	else
+		finish
 	endif
 endif
 
-set t_Co=256
-let g:colors_name = "pinkwinter"
 
-hi Boolean           guifg=#dde4e6  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=45    ctermbg=NONE   cterm=NONE
-hi Cursor            guifg=#516c75  guibg=#F9F9F9  guisp=#F9F9F9  gui=NONE       ctermfg=66    ctermbg=15     cterm=NONE
-hi cursorim          guifg=#516c75  guibg=#536991  guisp=#536991  gui=NONE       ctermfg=66    ctermbg=60     cterm=NONE
-hi Constant          guifg=#0099ff  guibg=NONE     guisp=NONE     gui=bold       ctermfg=33    ctermbg=NONE   cterm=bold
-hi Character         guifg=#c14fff  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=207   ctermbg=NONE   cterm=NONE
-hi Conditional       guifg=#d11b82  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi Comment           guifg=#838383  guibg=NONE     guisp=NONE     gui=italic     ctermfg=244   ctermbg=NONE   cterm=NONE
-hi CursorColumn      guifg=NONE     guibg=#222E30  guisp=#222E30  gui=NONE       ctermfg=NONE  ctermbg=239    cterm=NONE
-hi CursorLine        guifg=NONE     guibg=#222E30  guisp=#222E30  gui=NONE       ctermfg=88    ctermbg=239    cterm=underline
-hi Debug             guifg=#e6b800  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=99    ctermbg=NONE   cterm=NONE
-hi Define            guifg=#657089  guibg=NONE     guisp=NONE     gui=bold       ctermfg=61    ctermbg=NONE   cterm=NONE
-hi DefinedName       guifg=#ff14e4  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=200   ctermbg=NONE   cterm=NONE
-hi Delimiter         guifg=#ff00a6  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=207   ctermbg=NONE   cterm=NONE
-hi DiffAdd           guifg=NONE     guibg=#193224  guisp=#193224  gui=NONE       ctermfg=NONE  ctermbg=239    cterm=NONE
-hi DiffChange        guifg=NONE     guibg=#492224  guisp=#492224  gui=NONE       ctermfg=NONE  ctermbg=52     cterm=NONE
-hi DiffDelete        guifg=NONE     guibg=#192224  guisp=#192224  gui=NONE       ctermfg=NONE  ctermbg=239    cterm=NONE
-hi DiffText          guifg=NONE     guibg=#492224  guisp=#492224  gui=NONE       ctermfg=NONE  ctermbg=52     cterm=NONE
-hi Directory         guifg=#83a6e4  guibg=NONE     guisp=NONE     gui=bold       ctermfg=45    ctermbg=NONE   cterm=bold
-hi Error             guifg=#dde4e6  guibg=#912C00  guisp=#912C00  gui=NONE       ctermfg=254   ctermbg=88     cterm=NONE
-hi ErrorMsg          guifg=#dde4e6  guibg=#912C00  guisp=#912C00  gui=NONE       ctermfg=254   ctermbg=88     cterm=NONE
-hi Exception         guifg=#ff3ed8  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi Float             guifg=#dde4e6  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=37    ctermbg=NONE   cterm=NONE
-hi FoldColumn        guifg=#516c75  guibg=#A1A6A8  guisp=#A1A6A8  gui=italic     ctermfg=69    ctermbg=1      cterm=NONE
-hi Folded            guifg=#516c75  guibg=#A1A6A8  guisp=#A1A6A8  gui=italic     ctermfg=69    ctermbg=237    cterm=NONE
-hi Function          guifg=#00dcf0  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=38    ctermbg=NONE   cterm=NONE
-hi Identifier        guifg=#e6b800  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=201   ctermbg=NONE   cterm=NONE
-hi Include           guifg=#e6b800  guibg=NONE     guisp=NONE     gui=bold       ctermfg=69    ctermbg=NONE   cterm=bold
-hi IncSearch         guifg=#516c75  guibg=#BD9800  guisp=#BD9800  gui=NONE       ctermfg=72    ctermbg=233    cterm=NONE
-hi Keyword           guifg=#e02093  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi Label             guifg=#e6b800  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi LineNr            guifg=#596992  guibg=#141414  guisp=#141414  gui=NONE       ctermfg=36    ctermbg=233    cterm=NONE
-hi Macro             guifg=#ff57e6  guibg=NONE     guisp=NONE     gui=bold       ctermfg=69    ctermbg=NONE   cterm=bold
-hi MatchParen        guifg=#db4cff  guibg=NONE     guisp=NONE     gui=bold       ctermfg=50    ctermbg=39     cterm=NONE
-hi ModeMsg           guifg=#e6e6e6  guibg=#192224  guisp=#192224  gui=bold       ctermfg=254   ctermbg=235    cterm=bold
-hi MoreMsg           guifg=#e6b800  guibg=NONE     guisp=NONE     gui=bold       ctermfg=34    ctermbg=NONE   cterm=bold
-hi NonText           guifg=#a3bac1  guibg=NONE     guisp=NONE     gui=italic     ctermfg=105   ctermbg=NONE   cterm=NONE
-hi Normal            guifg=#949dff  guibg=#1e1e1e  guisp=#1e1e1e  gui=NONE       ctermfg=105   ctermbg=234    cterm=NONE
-hi Number            guifg=#46aa8f  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=31    ctermbg=NONE   cterm=NONE
-hi Operator          guifg=#ff3ed8  guibg=NONE     guisp=NONE     gui=bold       ctermfg=141   ctermbg=NONE   cterm=NONE
-hi PMenu             guifg=#7721e0  guibg=#09b1e0  guisp=#09b1e0  gui=NONE       ctermfg=72    ctermbg=233    cterm=NONE
-hi PMenuSel          guifg=#516c75  guibg=#BD9800  guisp=#BD9800  gui=NONE       ctermfg=75    ctermbg=235    cterm=NONE
-hi PMenuThumb        guifg=NONE     guibg=#a4a6a8  guisp=#a4a6a8  gui=NONE       ctermfg=72    ctermbg=233    cterm=NONE
-hi PMenuSbar         guifg=NONE     guibg=#848688  guisp=#848688  gui=NONE       ctermfg=NONE  ctermbg=102    cterm=NONE
-hi PreCondit         guifg=#e6b800  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=201   ctermbg=NONE   cterm=NONE
-hi PreProc           guifg=#657089  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=63    ctermbg=NONE   cterm=NONE
-hi Repeat            guifg=#e6b800  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi Search            guifg=#516c75  guibg=#BD9800  guisp=#BD9800  gui=NONE       ctermfg=232   ctermbg=33     cterm=NONE
-hi SignColumn        guifg=#516c75  guibg=#536991  guisp=#536991  gui=NONE       ctermfg=66    ctermbg=60     cterm=NONE
-hi Special           guifg=#f737f7  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=13    ctermbg=NONE   cterm=NONE
-hi SpecialChar       guifg=#f737f7  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=165   ctermbg=NONE   cterm=NONE
-hi SpecialComment    guifg=#e6b800  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=255   ctermbg=NONE   cterm=NONE
-hi SpecialKey        guifg=#a3bac1  guibg=NONE     guisp=NONE     gui=italic     ctermfg=105   ctermbg=NONE   cterm=NONE
-hi SpellBad          guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=underline  ctermfg=254   ctermbg=239    cterm=underline
-hi SpellCap          guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=underline  ctermfg=254   ctermbg=239    cterm=underline
-hi SpellLocal        guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=underline  ctermfg=254   ctermbg=239    cterm=underline
-hi SpellRare         guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=underline  ctermfg=254   ctermbg=239    cterm=underline
-hi StatusLine        guifg=#516c75  guibg=#BD9800  guisp=#BD9800  gui=bold       ctermfg=32    ctermbg=232    cterm=bold
-hi StatusLineNC      guifg=#516c75  guibg=#5E6C70  guisp=#5E6C70  gui=bold       ctermfg=105   ctermbg=234    cterm=bold
-hi Statement         guifg=#ff3ed8  guibg=NONE     guisp=NONE     gui=bold       ctermfg=201   ctermbg=NONE   cterm=bold
-hi StorageClass      guifg=#83a6e4  guibg=NONE     guisp=NONE     gui=bold       ctermfg=45    ctermbg=NONE   cterm=bold
-hi String            guifg=#aa6dec  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=171   ctermbg=NONE   cterm=NONE
-hi Structure         guifg=#83a6e4  guibg=NONE     guisp=NONE     gui=bold       ctermfg=45    ctermbg=NONE   cterm=bold
-hi TabLine           guifg=#516c75  guibg=#5E6C70  guisp=#5E6C70  gui=bold       ctermfg=105   ctermbg=234    cterm=bold
-hi TabLineFill       guifg=#516c75  guibg=#5E6C70  guisp=#5E6C70  gui=bold       ctermfg=66    ctermbg=234    cterm=bold
-hi TabLineSel        guifg=#516c75  guibg=#BD9800  guisp=#BD9800  gui=bold       ctermfg=32    ctermbg=233    cterm=bold
-hi Tag               guifg=#e6b800  guibg=NONE     guisp=NONE     gui=NONE       ctermfg=201   ctermbg=NONE   cterm=NONE
-hi Title             guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=bold       ctermfg=75    ctermbg=234    cterm=bold
-hi Todo              guifg=#e0e0e6  guibg=#BD9800  guisp=#BD9800  gui=NONE       ctermfg=30    ctermbg=233    cterm=NONE
-hi Type              guifg=#37c8e5  guibg=NONE     guisp=NONE     gui=bold       ctermfg=45    ctermbg=NONE   cterm=bold
-hi Typedef           guifg=#83a6e4  guibg=NONE     guisp=NONE     gui=bold       ctermfg=45    ctermbg=NONE   cterm=bold
-hi Underlined        guifg=#e0e0e6  guibg=#192224  guisp=#192224  gui=underline  ctermfg=254   ctermbg=239    cterm=underline
-hi VertSplit         guifg=#516c75  guibg=#5E6C70  guisp=#5E6C70  gui=bold       ctermfg=105   ctermbg=232    cterm=bold
-hi Visual            guifg=#516c75  guibg=#F9F9FF  guisp=#F9F9FF  gui=NONE       ctermfg=111   ctermbg=237    cterm=NONE
-hi VisualNOS         guifg=#516c75  guibg=#F9F9FF  guisp=#F9F9FF  gui=underline  ctermfg=111   ctermbg=237    cterm=underline
-hi WarningMsg        guifg=#dde4e6  guibg=#912C00  guisp=#912C00  gui=NONE       ctermfg=254   ctermbg=88     cterm=NONE
-hi WildMenu          guifg=NONE     guibg=#A1A6A8  guisp=#A1A6A8  gui=NONE       ctermfg=NONE  ctermbg=239    cterm=NONE
 
-"hi CTagsMember -- no settings --
-"hi CTagsGlobalConstant -- no settings --
-"hi Union -- no settings --
-"hi Question -- no settings --
-"hi EnumerationName -- no settings --
-"hi LocalVariable -- no settings --
-"hi CTagsClass -- no settings --
-"hi clear -- no settings --
-"hi CTagsImport -- no settings --
-"hi CTagsGlobalVariable -- no settings --
-"hi EnumerationValue -- no settings --
-"hi Ignore -- no settings --
+hi Boolean           ctermfg=45    ctermbg=NONE   cterm=NONE
+hi Cursor            ctermfg=66    ctermbg=15     cterm=NONE
+hi Constant          ctermfg=33    ctermbg=NONE   cterm=bold
+hi Character         ctermfg=207   ctermbg=NONE   cterm=NONE
+hi Conditional       ctermfg=201   ctermbg=NONE   cterm=bold
+hi Comment           ctermfg=244   ctermbg=NONE   cterm=NONE
+hi CursorLine        ctermfg=NONE  ctermbg=235    cterm=NONE
+hi CursorLineNr      ctermfg=45    ctermbg=235    cterm=bold
+hi Define            ctermfg=61    ctermbg=NONE   cterm=NONE
+hi DefinedName       ctermfg=200   ctermbg=NONE   cterm=NONE
+hi Delimiter         ctermfg=207   ctermbg=NONE   cterm=NONE
+hi Directory         ctermfg=45    ctermbg=NONE   cterm=bold
+hi Error             ctermfg=231   ctermbg=1      cterm=NONE
+hi ErrorMsg          ctermfg=231   ctermbg=1      cterm=NONE
+hi Exception         ctermfg=201   ctermbg=NONE   cterm=bold
+hi Float             ctermfg=37    ctermbg=NONE   cterm=NONE
+hi Function          ctermfg=38    ctermbg=NONE   cterm=NONE
+hi Identifier        ctermfg=201   ctermbg=NONE   cterm=NONE
+hi Include           ctermfg=69    ctermbg=NONE   cterm=bold
+hi IncSearch         ctermfg=232   ctermbg=33     cterm=NONE
+hi Keyword           ctermfg=201   ctermbg=NONE   cterm=bold
+hi Label             ctermfg=201   ctermbg=NONE   cterm=bold
+hi LineNr            ctermfg=36    ctermbg=233    cterm=NONE
+hi Macro             ctermfg=69    ctermbg=NONE   cterm=bold
+hi MatchParen        ctermfg=50    ctermbg=39     cterm=NONE
+hi ModeMsg           ctermfg=254   ctermbg=235    cterm=bold
+hi MoreMsg           ctermfg=46    ctermbg=NONE   cterm=bold
+hi NonText           ctermfg=201   ctermbg=NONE   cterm=NONE
+hi Normal            ctermfg=105   ctermbg=234    cterm=NONE
+hi Number            ctermfg=31    ctermbg=NONE   cterm=NONE
+hi Operator          ctermfg=39    ctermbg=NONE   cterm=NONE
+hi OverLength        ctermfg=46    ctermbg=234    cterm=bold
+hi PMenu             ctermfg=36    ctermbg=233    cterm=NONE
+hi PMenuSel          ctermfg=75    ctermbg=235    cterm=NONE
+hi PreCondit         ctermfg=201   ctermbg=NONE   cterm=NONE
+hi pythonFunction    ctermfg=38    ctermbg=NONE   cterm=NONE
+hi pythonException   ctermfg=231   ctermbg=1      cterm=NONE
+hi pythonEscape      ctermfg=201   ctermbg=NONE   cterm=NONE
+hi pythonStatement   ctermfg=45    ctermbg=NONE   cterm=bold
+hi Question          ctermfg=46    ctermbg=NONE   cterm=bold
+hi PreProc           ctermfg=63    ctermbg=NONE   cterm=NONE
+hi Repeat            ctermfg=201   ctermbg=NONE   cterm=bold
+hi Search            ctermfg=232   ctermbg=33     cterm=NONE
+hi SignColumn        ctermfg=46    ctermbg=234    cterm=NONE
+hi Special           ctermfg=13    ctermbg=NONE   cterm=NONE
+hi SpecialChar       ctermfg=165   ctermbg=NONE   cterm=NONE
+hi SpecialComment    ctermfg=231   ctermbg=NONE   cterm=NONE
+hi SpecialKey        ctermfg=105   ctermbg=NONE   cterm=NONE
+hi SpellBad          ctermfg=231   ctermbg=1      cterm=bold
+hi StatusLine        ctermfg=32    ctermbg=232    cterm=bold
+hi StatusLineNC      ctermfg=105   ctermbg=236    cterm=bold
+hi Statement         ctermfg=201   ctermbg=NONE   cterm=bold
+hi StorageClass      ctermfg=45    ctermbg=NONE   cterm=bold
+hi String            ctermfg=171   ctermbg=NONE   cterm=NONE
+hi Structure         ctermfg=45    ctermbg=NONE   cterm=bold
+hi TabLine           ctermfg=105   ctermbg=234    cterm=NONE
+hi TabLineFill       ctermfg=105   ctermbg=236    cterm=NONE
+hi TabLineSel        ctermfg=32    ctermbg=233    cterm=bold
+hi Title             ctermfg=201   ctermbg=NONE   cterm=NONE
+hi Todo              ctermfg=201   ctermbg=233    cterm=bold
+hi Type              ctermfg=45    ctermbg=NONE   cterm=bold
+hi Typedef           ctermfg=45    ctermbg=NONE   cterm=bold
+hi Underlined        ctermfg=231   ctermbg=239    cterm=underline
+hi VertSplit         ctermfg=105   ctermbg=236    cterm=NONE
+hi Visual            ctermfg=111   ctermbg=237    cterm=NONE
+hi WarningMsg        ctermfg=254   ctermbg=1      cterm=NONE