diff --git a/.vim/colors/melange.vim b/.vim/colors/melange.vim
index 00d1926..3f905e3 100644
--- a/.vim/colors/melange.vim
+++ b/.vim/colors/melange.vim
@@ -3,156 +3,9 @@ hi clear
 syntax reset
 set t_Co=256
 let g:colors_name = 'melange'
-if &background == 'dark'
-let g:terminal_color_0  = '#352F2A'
-let g:terminal_color_1  = '#B65C60'
-let g:terminal_color_2  = '#78997A'
-let g:terminal_color_3  = '#EBC06D'
-let g:terminal_color_4  = '#9AACCE'
-let g:terminal_color_5  = '#B380B0'
-let g:terminal_color_6  = '#86A3A3'
-let g:terminal_color_7  = '#A38D78'
-let g:terminal_color_8  = '#4D453E'
-let g:terminal_color_9  = '#F17C64'
-let g:terminal_color_10 = '#99D59D'
-let g:terminal_color_11 = '#EBC06D'
-let g:terminal_color_12 = '#9AACCE'
-let g:terminal_color_13 = '#CE9BCB'
-let g:terminal_color_14 = '#88B3B2'
-let g:terminal_color_15 = '#C1A78E'
 
-highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold
-highlight Boolean guifg=#CE9BCB guibg=NONE guisp=NONE gui=NONE
-highlight Character guifg=#9AACCE guibg=NONE guisp=NONE gui=NONE
-highlight ColorColumn guifg=NONE guibg=#352F2A guisp=NONE gui=NONE
-highlight Comment guifg=#A38D78 guibg=NONE guisp=NONE gui=italic
-highlight Conceal guifg=#C1A78E guibg=NONE guisp=NONE gui=NONE
-highlight Constant guifg=#B380B0 guibg=NONE guisp=NONE gui=NONE
-highlight CursorLineNr guifg=#E49B5D guibg=NONE guisp=NONE gui=NONE
-highlight Delimiter guifg=#8E733F guibg=NONE guisp=NONE gui=NONE
-highlight DiagnosticError guifg=#B65C60 guibg=NONE guisp=NONE gui=NONE
-highlight DiagnosticHint guifg=#99D59D guibg=NONE guisp=NONE gui=NONE
-highlight DiagnosticInfo guifg=#9AACCE guibg=NONE guisp=NONE gui=NONE
-highlight DiagnosticUnderlineError guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight DiagnosticUnderlineHint guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight DiagnosticUnderlineInfo guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight DiagnosticUnderlineWarn guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight DiagnosticWarn guifg=#EBC06D guibg=NONE guisp=NONE gui=NONE
-highlight DiffAdd guifg=NONE guibg=#1F3521 guisp=NONE gui=NONE
-highlight DiffChange guifg=NONE guibg=#462445 guisp=NONE gui=NONE
-highlight DiffDelete guifg=NONE guibg=#7D2A2F guisp=NONE gui=NONE
-highlight DiffText guifg=NONE guibg=#243146 guisp=NONE gui=NONE
-highlight Directory guifg=#86A3A3 guibg=NONE guisp=NONE gui=NONE
-highlight Error guifg=NONE guibg=#7D2A2F guisp=NONE gui=NONE
-highlight ErrorMsg guifg=NONE guibg=#7D2A2F guisp=NONE gui=NONE
-highlight Folded guifg=#A38D78 guibg=#352F2A guisp=NONE gui=NONE
-highlight Function guifg=#EBC06D guibg=NONE guisp=NONE gui=NONE
-highlight GitSignsAdd guifg=#78997A guibg=NONE guisp=NONE gui=NONE
-highlight GitSignsChange guifg=#B380B0 guibg=NONE guisp=NONE gui=NONE
-highlight GitSignsCurrentLineBlame guifg=#697893 guibg=NONE guisp=NONE gui=NONE
-highlight GitSignsDelete guifg=#B65C60 guibg=NONE guisp=NONE gui=NONE
-highlight HelpHyperTextJump guifg=#E49B5D guibg=NONE guisp=NONE gui=NONE
-highlight Identifier guifg=#ECE1D7 guibg=NONE guisp=NONE gui=NONE
-highlight Ignore guifg=#A38D78 guibg=NONE guisp=NONE gui=NONE
-highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic
-highlight LineNr guifg=#4D453E guibg=NONE guisp=NONE gui=NONE
-highlight LspDiagnosticsUnderlineError guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight LspDiagnosticsUnderlineHint guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight LspDiagnosticsUnderlineInformation guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight LspDiagnosticsUnderlineWarning guifg=NONE guibg=NONE guisp=NONE gui=undercurl
-highlight MatchParen guifg=#EBC06D guibg=#4D453E guisp=NONE gui=bold
-highlight Melange guifg=NONE guibg=NONE guisp=NONE gui=NONE
-highlight ModeMsg guifg=#C1A78E guibg=NONE guisp=NONE gui=NONE
-highlight MoreMsg guifg=#78997A guibg=NONE guisp=NONE gui=bold
-highlight NonText guifg=None guibg=#000000 guisp=NONE gui=NONE
-highlight Normal guifg=#ECE1D7 guibg=#2A2520 guisp=NONE gui=NONE
-highlight NormalFloat guifg=NONE guibg=#352F2A guisp=NONE gui=NONE
-highlight Number guifg=#CE9BCB guibg=NONE guisp=NONE gui=NONE
-highlight Operator guifg=#F17C64 guibg=NONE guisp=NONE gui=NONE
-highlight PmenuSel guifg=NONE guibg=#4D453E guisp=NONE gui=NONE
-highlight PreProc guifg=#99D59D guibg=NONE guisp=NONE gui=NONE
-highlight Search guifg=#2A2520 guibg=#8E733F guisp=NONE gui=NONE
-highlight Special guifg=#EBC06D guibg=NONE guisp=NONE gui=NONE
-highlight SpecialChar guifg=#88B3B2 guibg=NONE guisp=NONE gui=NONE
-highlight SpellBad guifg=#B65C60 guibg=NONE guisp=NONE gui=undercurl
-highlight SpellCap guifg=#697893 guibg=NONE guisp=NONE gui=undercurl
-highlight SpellLocal guifg=#E49B5D guibg=NONE guisp=NONE gui=undercurl
-highlight SpellRare guifg=#EBC06D guibg=NONE guisp=NONE gui=undercurl
-highlight Statement guifg=#E49B5D guibg=NONE guisp=NONE gui=NONE
-highlight StatusLineNC guifg=#C1A78E guibg=#352F2A guisp=NONE gui=NONE
-highlight String guifg=#9AACCE guibg=NONE guisp=NONE gui=italic
-highlight Substitute guifg=#2A2520 guibg=#8E733F guisp=NONE gui=NONE
-highlight TSConstBuiltin guifg=#B380B0 guibg=NONE guisp=NONE gui=italic
-highlight TSLabel guifg=#88B3B2 guibg=NONE guisp=NONE gui=NONE
-highlight TSMath guifg=#88B3B2 guibg=NONE guisp=NONE gui=NONE
-highlight TSNamespace guifg=#78997A guibg=NONE guisp=NONE gui=NONE
-highlight TSPunctDelimiter guifg=#B65C60 guibg=NONE guisp=NONE gui=NONE
-highlight TSStrike guifg=NONE guibg=NONE guisp=NONE gui=strikethrough
-highlight TSStringEscape guifg=#697893 guibg=NONE guisp=NONE gui=NONE
-highlight TSStrong guifg=NONE guibg=NONE guisp=NONE gui=bold
-highlight TSSymbol guifg=#ECE1D7 guibg=NONE guisp=NONE gui=italic
-highlight TSURI guifg=#9AACCE guibg=NONE guisp=NONE gui=underline
-highlight TSVariableBuiltin guifg=#ECE1D7 guibg=NONE guisp=NONE gui=italic
-highlight TabLineSel guifg=NONE guibg=#352F2A guisp=NONE gui=bold
-highlight Title guifg=#E49B5D guibg=NONE guisp=NONE gui=NONE
-highlight Todo guifg=#C1A78E guibg=NONE guisp=NONE gui=italic
-highlight Type guifg=#86A3A3 guibg=NONE guisp=NONE gui=NONE
-highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline
-highlight VertSplit guifg=#4D453E guibg=NONE guisp=NONE gui=NONE
-highlight Visual guifg=NONE guibg=#4D453E guisp=NONE gui=NONE
-highlight WarningMsg guifg=#B65C60 guibg=NONE guisp=NONE gui=NONE
-highlight Whitespace guifg=#4D453E guibg=NONE guisp=NONE gui=NONE
-highlight netrwExe guifg=#B65C60 guibg=NONE guisp=NONE gui=NONE
-highlight netrwSymLink guifg=#B380B0 guibg=NONE guisp=NONE gui=NONE
-highlight texTitleArg guifg=NONE guibg=NONE guisp=NONE gui=bold
-highlight! link CursorColumn ColorColumn
-highlight! link CursorLine ColorColumn
-highlight! link DiffAdded DiffAdd
-highlight! link DiffRemoved DiffDelete
-highlight! link EndOfBuffer Whitespace
-highlight! link FoldColumn LineNr
-highlight! link LspDiagnosticsDefaultError DiagnosticError
-highlight! link LspDiagnosticsDefaultHint DiagnosticHint
-highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo
-highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn
-highlight! link LspReferenceRead Visual
-highlight! link LspReferenceText Visual
-highlight! link LspReferenceWrite Visual
-highlight! link NonText Whitespace
-highlight! link Pmenu NormalFloat
-highlight! link PmenuSbar Pmenu
-highlight! link PmenuThumb PmenuSel
-highlight! link Question MoreMsg
-highlight! link SignColumn LineNr
-highlight! link SignifySignAdd GitSignsAdd
-highlight! link SignifySignChange GitSignsChange
-highlight! link SignifySignDelete GitSignsDelete
-highlight! link SpecialKey Whitespace
-highlight! link StatusLine NormalFloat
-highlight! link TSConstMacro Constant
-highlight! link TSEmphasis Italic
-highlight! link TSEnvironment Statement
-highlight! link TSEnvironmentName PreProc
-highlight! link TSFuncBuiltin Function
-highlight! link TSFuncMacro Function
-highlight! link TSKeywordFunction PreProc
-highlight! link TSUnderline Underlined
-highlight! link TSVariable Identifier
-highlight! link TabLine StatusLineNC
-highlight! link TabLineFill StatusLine
-highlight! link WildMenu NormalFloat
-highlight! link netrwClassify Delimiter
-highlight! link netrwTreeBar Delimiter
-highlight! link texFileArg Constant
-highlight! link texMathCmd Function
-highlight! link texMathDelim Delimiter
-highlight! link texMathDelimZone TSPunctDelimiter
-highlight! link texMathEnvArgName PreProc
-highlight! link texMathSymbol Operator
-highlight! link texMathZone TSMath
-highlight! link texOptEqual Operator
-highlight! link texOptSep TSPunctDelimiter
-highlight! link texRefArg Constant
+if &background == 'dark'
+
 else
 let g:terminal_color_0  = '#E9E1DB'
 let g:terminal_color_1  = '#D7898C'
@@ -216,13 +69,13 @@ highlight Melange guifg=NONE guibg=NONE guisp=NONE gui=NONE
 highlight ModeMsg guifg=#DED2C8 guibg=#6B5C4D guisp=NONE gui=NONE
 highlight MoreMsg guifg=#83B887 guibg=NONE guisp=NONE gui=bold
 highlight NonText guifg=#DED2C8 guibg=#000000 guisp=NONE gui=NONE
-highlight Normal guifg=#6B5C4D guibg=#F4F0ED guisp=NONE gui=NONE
+highlight Normal guifg=#6B5C4D guibg=#FAFBFC guisp=NONE gui=NONE
 highlight NormalFloat guifg=NONE guibg=#E9E1DB guisp=NONE gui=NONE
 highlight Number guifg=#854882 guibg=NONE guisp=NONE gui=NONE
 highlight Operator guifg=#C65333 guibg=NONE guisp=NONE gui=NONE
 highlight PmenuSel guifg=NONE guibg=#DED2C8 guisp=NONE gui=NONE
 highlight PreProc guifg=#659E69 guibg=NONE guisp=NONE gui=NONE
-highlight Search guifg=#F4F0ED guibg=#E2C28C guisp=NONE gui=NONE
+highlight Search guifg=#FAFBFC guibg=#E2C28C guisp=NONE gui=NONE
 highlight Special guifg=#C29830 guibg=NONE guisp=NONE gui=NONE
 highlight SpecialChar guifg=#436460 guibg=NONE guisp=NONE gui=NONE
 highlight SpellBad guifg=#D7898C guibg=NONE guisp=NONE gui=undercurl
@@ -232,7 +85,7 @@ highlight SpellRare guifg=#C29830 guibg=NONE guisp=NONE gui=undercurl
 highlight Statement guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE
 highlight StatusLineNC guifg=#867462 guibg=#E9E1DB guisp=NONE gui=NONE
 highlight String guifg=#485F84 guibg=NONE guisp=NONE gui=italic
-highlight Substitute guifg=#F4F0ED guibg=#E2C28C guisp=NONE gui=NONE
+highlight Substitute guifg=#FAFBFC guibg=#E2C28C guisp=NONE gui=NONE
 highlight TSConstBuiltin guifg=#BE79BB guibg=NONE guisp=NONE gui=italic
 highlight TSLabel guifg=#436460 guibg=NONE guisp=NONE gui=NONE
 highlight TSMath guifg=#436460 guibg=NONE guisp=NONE gui=NONE