3 files changed, 13 insertions, 5 deletions

diff --git a/plugin/KarlMarks.vim b/plugin/KarlMarks.vim
index a36ecab..6e5a408 100644
--- a/plugin/KarlMarks.vim
+++ b/plugin/KarlMarks.vim
@@ -16,7 +16,7 @@ function! KarlMarks()
 
         if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0 
             exec "sign unplace ".c
-            exec "sign define mark_".c." text=".nr2char(c)." texthl=linenr"
+            exec "sign define mark_".c." text=".nr2char(c)." texthl=SignColumn"
             exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0)
         endif  
     endfor 
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index 87c9efe..7dda5bf 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -11,7 +11,8 @@ function! ExtendColorTheme()
     highlight! Error          cterm=NONE ctermbg=NONE               gui=NONE            guibg=NONE
     highlight! SpellBad       cterm=NONE                            gui=undercurl       guibg=NONE guifg=red
     highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE            guibg=NONE guifg=NONE
-    highlight! Folded         cterm=NONE ctermbg=NONE
+    highlight! LineNr         cterm=bold,italic,inverse ctermbg=NONE ctermfg=fg
+    " highlight! VertSplit      ctermbg=252 ctermfg=252
 
 
 
@@ -37,6 +38,7 @@ function! ExtendColorTheme()
     highlight! link        VertSplit      LineNr
     highlight! link        SignColumn     LineNr
     highlight! link        FoldColumn     LineNr
+    highlight! link        Folded         LineNr
 
     highlight! link        PmenuSbar      Pmenu
     highlight! PmenuThumb  cterm=inverse
@@ -48,7 +50,7 @@ endfunction
 autocmd ColorScheme * call ExtendColorTheme()
 
 
-set background=dark
+" set background=light
 if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
     let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
     let base16colorspace     =  256
@@ -57,7 +59,7 @@ else
     let g:PaperColor_Theme_Options = {
                 \   'theme': {
                 \     'default': {
-                \       'transparent_background': 1
+                \       'transparent_background': 0
                 \     }
                 \   }
                 \ }
diff --git a/plugin/max-highlight-word-under-cursor.vim b/plugin/max-highlight-word-under-cursor.vim
index 2e7f5a0..c6d6964 100644
--- a/plugin/max-highlight-word-under-cursor.vim
+++ b/plugin/max-highlight-word-under-cursor.vim
@@ -11,7 +11,13 @@ function! HighlightWordUnderCursor()
     let l:currentword = escape(expand('<cword>'), '.')
     if(strlen(l:currentword) > 0)
         let w:m1=100
-        silent! call matchadd('Underline', '\<'.l:currentword.'\>', -1, w:m1)
+        if(match(expand('<cWORD>'), '^#\x\{6\}') == 0)
+            exec 'highlight! CurrentColor guibg='.expand('<cWORD>')
+            hi CurrentColor
+            " silent! call matchadd('CurrentColor', escape(expand('<cWORD>'), '.'), -1, w:m1)
+        else
+            silent! call matchadd('Underline', '\<'.l:currentword.'\>', -1, w:m1)
+        endif
     endif
 endfunction