2 files changed, 13 insertions, 3 deletions

diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index d68c84a..c357117 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -1,6 +1,14 @@
 "=======================================================================================================================
 " COLOR SCHEME:
 "=======================================================================================================================
+
+if &term == "linux"
+    set notermguicolors
+else
+    set termguicolors
+endif
+
+
 function! ExtendColorTheme()
     highlight! Bold                                      cterm=bold            gui=bold
     highlight! Italic                                    cterm=italic          gui=italic
diff --git a/plugin/max-highlight-word-under-cursor.vim b/plugin/max-highlight-word-under-cursor.vim
index c6d6964..f18c212 100644
--- a/plugin/max-highlight-word-under-cursor.vim
+++ b/plugin/max-highlight-word-under-cursor.vim
@@ -11,10 +11,12 @@ function! HighlightWordUnderCursor()
     let l:currentword = escape(expand('<cword>'), '.')
     if(strlen(l:currentword) > 0)
         let w:m1=100
-        if(match(expand('<cWORD>'), '^#\x\{6\}') == 0)
-            exec 'highlight! CurrentColor guibg='.expand('<cWORD>')
+        let l:q = matchstr(expand('<cword>'), '\x\{6\}')
+        if(l:q != "")
+            exec 'highlight! CurrentColor guibg=#'.l:q
+            " call matchadd('CurrentColor', escape(expand('<cWORD>'), '.'), -1, w:m1)
+            " if(match(expand('<cword>'), '^#\x\{6\}\|^0x\x\{6\}') == 0)
             hi CurrentColor
-            " silent! call matchadd('CurrentColor', escape(expand('<cWORD>'), '.'), -1, w:m1)
         else
             silent! call matchadd('Underline', '\<'.l:currentword.'\>', -1, w:m1)
         endif