rework colorscheme with normal backgrounds

diff --git a/.vim/colors/madduck.vim b/.vim/colors/madduck.vim
index c79b8a6694b475c3768a9967cfc7e8262f627ed2..6d62396d41b2e53da38298e3fd76189056942899 100644 (file)
--- a/.vim/colors/madduck.vim
+++ b/.vim/colors/madduck.vim
@@ -6,14 +6,15 @@ endif
 let g:colors_name = "madduck"
 
 if &background == "dark"
-  hi Comment     ctermfg=DarkGreen   ctermbg=none    cterm=none      term=bold
-  hi Constant    ctermfg=Cyan        ctermbg=none    cterm=none      term=underline
-  hi Special     ctermfg=LightRed    ctermbg=none    cterm=none      term=bold
-  hi Identifier ctermfg=White       ctermbg=none    cterm=none      term=underline
-  hi Statement ctermfg=Yellow      ctermbg=none    cterm=bold      term=bold
-  hi PreProc     ctermfg=Cyan        ctermbg=none    cterm=bold      term=underline
-  hi Type            ctermfg=LightGreen  ctermbg=none    cterm=bold      term=underline
-  hi Ignore        ctermfg=Black       ctermbg=none    cterm=none      term=none
+  hi Normal       ctermfg=White       ctermbg=Black  cterm=none      term=none
+  hi Comment     ctermfg=fg          ctermbg=bg    cterm=none      term=bold
+  hi Constant    ctermfg=Cyan        ctermbg=bg    cterm=none      term=underline
+  hi Special     ctermfg=LightRed    ctermbg=bg    cterm=none      term=bold
+  hi Identifier ctermfg=fg            ctermbg=bg    cterm=none      term=underline
+  hi Statement ctermfg=Yellow      ctermbg=bg    cterm=bold      term=bold
+  hi PreProc     ctermfg=Cyan        ctermbg=bg    cterm=bold      term=underline
+  hi Type            ctermfg=LightGreen  ctermbg=bg    cterm=bold      term=underline
+  hi Ignore        ctermfg=bg       ctermbg=bg    cterm=none      term=none
 
   hi mailHeader             ctermfg=darkcyan
   hi mailSignature          ctermfg=darkcyan
@@ -32,14 +33,15 @@ if &background == "dark"
   hi Todo      ctermfg=Black       ctermbg=Yellow  cterm=standout  term=standout
 
 else
-  hi Comment     ctermfg=Black       ctermbg=White   cterm=none      term=bold
-  hi Constant    ctermfg=DarkGray    ctermbg=none    cterm=none      term=underline
-  hi Special     ctermfg=DarkMagenta ctermbg=none    cterm=none      term=bold
-  hi Identifier ctermfg=DarkBlue    ctermbg=none    cterm=none      term=underline
-  hi Statement ctermfg=DarkBlue    ctermbg=none    cterm=none      term=bold
-  hi PreProc     ctermfg=DarkMagenta ctermbg=none    cterm=none      term=underline
-  hi Type            ctermfg=DarkBlue    ctermbg=none    cterm=none      term=underline
-  hi Ignore        ctermfg=White       ctermbg=none    cterm=none      term=none
+  hi Normal       ctermfg=Black       ctermbg=White  cterm=none      term=none
+  hi Comment     ctermfg=fg       ctermbg=bg   cterm=none      term=bold
+  hi Constant    ctermfg=DarkGray    ctermbg=bg    cterm=none      term=underline
+  hi Special     ctermfg=DarkMagenta ctermbg=bg    cterm=none      term=bold
+  hi Identifier ctermfg=DarkBlue    ctermbg=bg    cterm=none      term=underline
+  hi Statement ctermfg=DarkBlue    ctermbg=bg    cterm=none      term=bold
+  hi PreProc     ctermfg=DarkMagenta ctermbg=bg    cterm=none      term=underline
+  hi Type            ctermfg=DarkBlue    ctermbg=bg    cterm=none      term=underline
+  hi Ignore        ctermfg=bg          ctermbg=bg    cterm=none      term=none
 
   hi mailHeader             ctermfg=darkblue cterm=none
   hi mailSignature          ctermfg=darkblue
@@ -58,8 +60,8 @@ else
   hi Todo      ctermfg=Black       ctermbg=Yellow  cterm=standout  term=standout
 
   hi SpellBad          ctermfg=white   ctermbg=darkred cterm=none      term=reverse
-  hi SpellCap          ctermfg=darkred ctermbg=none    cterm=bold      term=reverse
-  hi SpellRare         ctermfg=red     ctermbg=none    cterm=none      term=reverse
+  hi SpellCap          ctermfg=darkred ctermbg=bg      cterm=bold      term=reverse
+  hi SpellRare         ctermfg=red     ctermbg=bg      cterm=none      term=reverse
   hi SpellLocal                ctermfg=white   ctermbg=magenta cterm=none      term=reverse
 
   hi Highlit           ctermbg=yellow  ctermfg=black   cterm=none      term=reverse