diff --git a/vim/colors/jdkaplan-dark.vim b/vim/colors/jdkaplan-dark.vim
index 767cde2..3e036d5 100644
--- a/vim/colors/jdkaplan-dark.vim
+++ b/vim/colors/jdkaplan-dark.vim
@@ -1,23 +1,22 @@
-" Vim color file jdkaplan
-
 hi clear
 if exists("syntax_on")
 syntax reset
 endif
 set background=dark
-let colors_name = "jdkaplan"
+let colors_name = "jdkaplan-dark"
 
 hi Comment              cterm=none      ctermfg=145
 hi Constant             cterm=none      ctermfg=141
 hi Cursor               cterm=none                  ctermbg=255
 hi CursorLine           cterm=none                  ctermbg=232
+hi CursorLineNr         cterm=none      ctermfg=222 ctermbg=232
 hi CursorColumn         cterm=none                  ctermbg=232
 hi Directory            cterm=none      ctermfg=33
 hi ExtraWhitespace      cterm=none                  ctermbg=160
 hi Folded               cterm=none      ctermfg=220 ctermbg=59
 hi Function             cterm=none      ctermfg=45
 hi Identifier           cterm=none      ctermfg=45
-hi LineNr               cterm=none      ctermfg=245
+hi LineNr               cterm=none      ctermfg=245 ctermbg=235
 hi MatchParen           cterm=none      ctermfg=209 ctermbg=235
 hi Normal               cterm=none      ctermfg=254 ctermbg=235
 hi NonText              cterm=none      ctermfg=110 ctermbg=238
diff --git a/vim/colors/jdkaplan-light.vim b/vim/colors/jdkaplan-light.vim
index cd80450..f9f50e7 100644
--- a/vim/colors/jdkaplan-light.vim
+++ b/vim/colors/jdkaplan-light.vim
@@ -1,40 +1,39 @@
-" Vim color file jdkaplan
-
 hi clear
 if exists("syntax_on")
 syntax reset
 endif
 set background=light
-let colors_name = "jdkaplan2"
+let colors_name = "jdkaplan-light"
 
 hi Comment              cterm=none      ctermfg=243
 hi Constant             cterm=none      ctermfg=63
 hi Cursor               cterm=none                  ctermbg=232
-hi CursorLine           cterm=none                  ctermbg=255
-hi CursorColumn         cterm=none                  ctermbg=255
+hi CursorLine           cterm=none                  ctermbg=254
+hi CursorLineNr         cterm=none      ctermfg=160 ctermbg=254
+hi CursorColumn         cterm=none                  ctermbg=254
 hi Directory            cterm=none      ctermfg=26
 hi ExtraWhitespace      cterm=none                  ctermbg=160
 hi Folded               cterm=none      ctermfg=220 ctermbg=242
 hi Function             cterm=none      ctermfg=32
 hi Identifier           cterm=none      ctermfg=32
-hi LineNr               cterm=none      ctermfg=244
-hi MatchParen           cterm=none      ctermfg=202 ctermbg=254
-hi Normal               cterm=none      ctermfg=233 ctermbg=254
+hi LineNr               cterm=none      ctermfg=248 ctermbg=255
+hi MatchParen           cterm=none      ctermfg=202 ctermbg=255
+hi Normal               cterm=none      ctermfg=233 ctermbg=255
 hi NonText              cterm=none      ctermfg=110 ctermbg=251
 hi Number               cterm=none      ctermfg=202
 hi PreProc              cterm=none      ctermfg=28
-hi SignColumn                                       ctermbg=242
+hi SignColumn                                       ctermbg=251
 hi Statement            cterm=none      ctermfg=28
 hi Special              cterm=none      ctermfg=233
 hi SpecialKey           cterm=none      ctermfg=28
-hi SpellBad       NONE  cterm=underline " TODO
-hi SpellCap       NONE  cterm=underline " TODO
+hi SpellBad       NONE  cterm=underline
+hi SpellCap       NONE  cterm=underline
 hi StatusLine           cterm=none      ctermfg=232 ctermbg=245
 hi StatusLineNC         cterm=none      ctermfg=244 ctermbg=251
 hi String               cterm=none      ctermfg=94
 hi StorageClass         cterm=none      ctermfg=136
 hi Title                cterm=none      ctermfg=233
-hi Todo                 cterm=none      ctermfg=196 ctermbg=254
+hi Todo                 cterm=none      ctermfg=196 ctermbg=255
 hi Type                 cterm=none      ctermfg=136
 hi Underlined           cterm=underline ctermfg=233
 hi VertSplit            cterm=none      ctermfg=248