Overhaul colorscheme

2 files changed, 76 insertions, 95 deletions

diff --git a/LICENSE b/LICENSE
index 1fe0906..a9a23fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018 Benjamin Linskey <contact@linskey.org>
+Copyright (c) 2018, 2019, 2020, 2023, 2026 Benjamin Linskey <contact@linskey.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/colors/btl.vim b/colors/btl.vim
index 54c2982..e0ede47 100644
--- a/colors/btl.vim
+++ b/colors/btl.vim
@@ -1,118 +1,99 @@
 " btl.vim colorscheme
 " Maintainer: Benjamin Linskey <vim@linskey.org>
-" URL: https://github.com/blinskey/btl.vim
+" URL: https://git.linskey.org/btl.vim
 
-" This is a simple colorscheme with minimal syntax highlighting that uses only
-" the 16 ANSI color codes.
-"
-" See h: group-name, highlight-groups
-
-set notermguicolors
+set termguicolors
 highlight clear
+set bg=dark
 let g:colors_name="btl"
 
 if exists("syntax_on")
 	syntax reset
 endif
 
-hi CursorLine	ctermfg=none	ctermbg=none	cterm=underline
-hi Visual	ctermfg=none	ctermbg=none	cterm=reverse
-
-if &background == "dark"
-	hi Normal	ctermfg=15	ctermbg=0	cterm=none
-	hi Underlined	ctermfg=7	ctermbg=0	cterm=underline
-	hi Error	ctermfg=9	ctermbg=0	cterm=none
-	hi MatchParen	ctermfg=15	ctermbg=8	cterm=none
-	hi StatusLine	ctermfg=0	ctermbg=15	cterm=none
-	hi StatusLineNC	ctermfg=7	ctermbg=8	cterm=none
-	hi Folded	ctermfg=7	ctermbg=8	cterm=none
-	hi LineNr	ctermfg=8	ctermbg=0	cterm=none
-	hi Pmenu	ctermfg=15	ctermbg=8	cterm=none
-	hi PmenuSel	ctermfg=8	ctermbg=15	cterm=none
-	hi PMenuThumb	ctermfg=15	ctermbg=15	cterm=none
-	hi DiffAdd	ctermfg=2	ctermbg=0	cterm=none
-	hi DiffChange	ctermfg=3	ctermbg=0	cterm=none
-	hi DiffDelete	ctermfg=1	ctermbg=0	cterm=none
-	hi DiffText	ctermfg=3	ctermbg=0	cterm=underline
-	hi Search	ctermfg=none	ctermbg=none	cterm=reverse
-	hi ColorColumn	ctermfg=none	ctermbg=8	cterm=none
-else
-	hi Normal	ctermfg=0	ctermbg=15	cterm=none
-	hi Underlined	ctermfg=0	ctermbg=15	cterm=underline
-	hi Error	ctermfg=9	ctermbg=15	cterm=none
-	hi ColorColumn	ctermfg=none	ctermbg=8	cterm=none
-	hi CursorLine	ctermfg=none	ctermbg=none	cterm=underline
-	hi MatchParen	ctermfg=0	ctermbg=7	cterm=none
-	hi StatusLine	ctermfg=7	ctermbg=8	cterm=none
-	hi StatusLineNC	ctermfg=0	ctermbg=7	cterm=none
-	hi Folded	ctermfg=8	ctermbg=15	cterm=none
-	hi LineNr	ctermfg=7	ctermbg=8	cterm=none
-	hi Pmenu	ctermfg=0	ctermbg=15	cterm=none
-	hi PmenuSel	ctermfg=15	ctermbg=8	cterm=none
-	hi PMenuThumb	ctermfg=8	ctermbg=8	cterm=none
-	hi DiffAdd	ctermfg=2	ctermbg=15	cterm=none
-	hi DiffChange	ctermfg=3	ctermbg=15	cterm=none
-	hi DiffDelete	ctermfg=1	ctermbg=15	cterm=none
-	hi DiffText	ctermfg=3	ctermbg=15	cterm=underline
-	hi Search	ctermfg=7	ctermbg=8	cterm=none
-	hi ColorColumn	ctermfg=none	ctermbg=7	cterm=none
-endif
-
-hi! link Tag		Underlined
-hi! link TabLine	StatusLineNC
-hi! link TabLineSel	StatusLine
-hi! link EndOfBuffer	Normal
-hi! link SpecialKey	Normal
-hi! link PMenuSBar	Pmenu
-hi! link IncSearch	Search
-hi! link Comment	Normal
-hi! link String		Normal
-hi! link Todo		Underlined
-hi! link TabLineFill	TabLine
-hi! link VertSplit	StatusLineNC
+" Text
+hi Normal		guifg=#eeeeee	guibg=#222222	cterm=none
+hi Comment		guifg=#c9c9c9	guibg=#222222	cterm=none
+hi Todo			guifg=#eeeeee	guibg=#222222	cterm=bold
+hi Underlined		guifg=#eeeeee	guibg=#222222	cterm=underline
+hi Error		guifg=#eeeeee	guibg=#bf3939	cterm=none
+hi Tag			guifg=#47aeed	guibg=#222222	cterm=underline
+hi! link helpHyperTextJump Tag
+hi EndOfBuffer		guifg=#a1a1a1	guibg=#222222	gui=none
+hi! link SpecialKey	EndOfBuffer
 hi! link NonText	SpecialKey
-hi! link CursorLineNr	LineNr
-hi! link Title		StatusLineNC
+hi MatchParen		guifg=#ffffff	guibg=#222222	cterm=bold
+hi String		guifg=#eeeeee	guibg=#222222	cterm=bold
+hi ErrorMsg		guifg=#eeeeee	guibg=#bf3939	cterm=none
+hi WarningMsg		guifg=#f27c7c	guibg=#222222	cterm=none
 hi! link ModeMsg	Normal
-hi! link Character	String
 hi! link Constant	Normal
-hi! link Number		Normal
-hi! link Boolean	Normal
-hi! link Float		Normal
-hi! link Function	Normal
 hi! link Identifier	Normal
-hi! link Keyword	Normal
 hi! link Statement	Normal
-hi! link Conditional	Normal
-hi! link Repeat		Normal
-hi! link Label		Normal
-hi! link Operator	Normal
-hi! link Exception	Normal
 hi! link PreProc	Normal
-hi! link Include	Normal
-hi! link Define		Normal
-hi! link Macro		Normal
-hi! link PreCondit	Normal
 hi! link Type		Normal
-hi! link StorageClass	Normal
-hi! link Structure	Normal
-hi! link Typedef	Normal
 hi! link Special	Normal
-hi! link SpecialChar	Normal
-hi! link Delimiter	Normal
-hi! link SpecialComment Normal
-hi! link Debug		Normal
+hi! link SpecialComment	Comment
 hi! link Ignore		Normal
-hi! link ErrorMsg	Error
+
+" Text selection
+hi Visual		guifg=#eeeeee	guibg=#4b4b4b	cterm=none
+hi Search		guifg=#222222	guibg=#eeeeee	cterm=none
+hi! link IncSearch	Search
+
+" UI 
+hi StatusLine		guifg=#222222	guibg=#c9c9c9	cterm=none
+hi StatusLineNC		guifg=#eeeeee	guibg=#4b4b4b	cterm=none
+hi Title 		guifg=#eeeeee	guibg=NONE	cterm=none
+hi TabLine		guifg=#eeeeee	guibg=#4b4b4b	cterm=none
+hi TabLineSel		guifg=#eeeeee	guibg=#787878	cterm=bold
+hi! link TabLineFill	TabLine
+hi! link TabPanel	TabLine
+hi! link TabPanelFill	TabLineSel
+hi! link TabPanelSel	TabLineSel
+hi VertSplit		guifg=#c9c9c9	guibg=#c9c9c9	cterm=none
+hi VertSplitNC		guifg=#4b4b4b	guibg=#4b4b4b	cterm=none
+hi ColorColumn		guifg=#eeeeee	guibg=#4b4b4b	cterm=none	
+hi CursorLine		guifg=NONE	guibg=NONE	cterm=none
+hi Folded		guifg=#eeeeee	guibg=#787878	cterm=none
+hi CursorLine		guifg=#eeeeee	guibg=#4b4b4b	cterm=none
+hi LineNr		guifg=#787878	guibg=#222222	cterm=none
+hi CursorLineNr		guifg=#eeeeee	guibg=#4b4b4b	cterm=bold
+hi QuickFixLine		guifg=#eeeeee	guibg=#787878	cterm=bold
 hi! link Directory	String
-hi! link Title		Normal
 
-hi! link gitcommitOverflow Error
+" Pop-up menu
+hi Pmenu		guifg=#eeeeee	guibg=#4b4b4b	cterm=none
+hi PmenuSel		guifg=#eeeeee	guibg=#787878	cterm=bold
+hi PMenuThumb		guifg=#4b4b4b	guibg=#a1a1a1	cterm=none
+hi! link PMenuSBar	Pmenu
+
+" Diff
+hi Added		guifg=#39bf8c	guibg=#222222	cterm=none
+hi Changed		guifg=#398cbf	guibg=#222222	cterm=none
+hi DiffText		guifg=#47aeed	guibg=#222222	cterm=bold
+hi Removed		guifg=#f27c7c	guibg=#222222	cterm=none
+hi! link DiffAdd	Added
+hi! link DiffChange	Changed
+hi! link DiffDelete	Removed
 
-hi! link helpHyperTextJump String
+" Markdown
+hi markdownItalic 	guifg=#eeeeee	guibg=#222222	cterm=italic
+hi markdownBold	 	guifg=#eeeeee	guibg=#222222	cterm=bold
+hi markdownBoldItalic	guifg=#eeeeee	guibg=#222222	cterm=bold,italic
+hi markdownH1		guifg=#eeeeee	guibg=#222222	cterm=bold
+hi! link markdownBlockquote	Normal
+hi! link markdownH2	MarkdownH1
+hi! link markdownH3	MarkdownH1
+hi! link markdownH4	MarkdownH1
+hi! link markdownH5	MarkdownH1
+hi! link markdownH6	MarkdownH1
+
+hi! link gitcommitOverflow Error
 
-hi! ALEError	ctermbg=1	cterm=none
-hi! ALEWarning	ctermbg=3	cterm=none
-hi! ALEInfo	ctermbg=4	cterm=reverse
-hi! link ALEStyleError ALEError
+" ALE
+hi ALEWarning		guifg=#222222	guibg=#bfbd39	cterm=none
+hi ALEInfo		guifg=#eeeeee	guibg=#398cbf	cterm=none
+hi! link ALEError	Error
+hi! link ALEStyleError 	ALEError
 hi! link ALEStyleWarning ALEWarning