2 files changed, 8 insertions, 5 deletions

diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index abfa11a..a6fe45e 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -12,20 +12,23 @@ function! ExtendColorTheme()
   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! EndOfBuffer    cterm=NONE ctermbg=255 ctermfg=255
 
 
+
+  let w:color=synIDattr(hlID("Normal"), "bg#")
+  silent! exec 'highlight invisible gui=NONE guifg='.w:color.'guibg='.w:color.' cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
+
+  highlight! link           EndOfBuffer                     Invisible
   highlight! link           qfSeparator                     Normal                                | " reserve one space
   highlight! link           qfLineNr                        Normal                                | " informational line numbers should look different
 
   highlight! link           SpecialKey                      NonText                               | " makes tab stop (see listchars) less disturbing
   highlight! link           WildMenu                        Search
   highlight! link           Convention                      Error
-  highlight! link           VertSplit                       NonText
 
   highlight! link           VertSplit                       LineNr
-  highlight! link           SignColumn                      NonText
-  highlight! link           FoldColumn                      NonText
+  highlight! link           SignColumn                      LineNr
+  highlight! link           FoldColumn                      LineNr
 
   highlight! link           PmenuSbar                       Pmenu
   highlight! PmenuThumb     cterm=inverse
diff --git a/utils/default-font.conf b/utils/default-font.conf
index 8c487c9..da115d4 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -11,7 +11,7 @@
     </match>
     <match target="pattern">
         <test qual="any" name="family"><string>sans-serif</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Sans Mono Bold</string></edit>
+        <edit name="family" mode="assign" binding="same"><string>Noto Sans</string></edit>
     </match>
     <match target="pattern">
         <test name="family" qual="any">