patch 9.0.1663: Termdebug on MS-Windows: some file names are not recognized

Problem: Termdebug on MS-Windows: some file names are not recognized. Solution: Do not always change \t and \n. (Christian Brabandt, closes #12565, closes #12560, closes #12550)
patch 9.0.1662: crash when using a class member twice
2025-12-30 10:58:24 +00:00 · 2023-06-24 20:02:25 +01:00 · 2023-06-24 19:22:21 +01:00 · 2023-06-24 17:11:04 +01:00 · 2023-06-24 16:42:25 +01:00 · 2023-06-24 14:20:36 +01:00
1622 changed files with 153667 additions and 79234 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,13 +1,33 @@
 version: "{build}"

+image: Visual Studio 2015
+
 skip_tags: true

 environment:
  matrix:
    - FEATURE: HUGE
+  
+    # Alternate environments, not used right now.  2022 is a lot slower.
+    #
+    # - job_name: VS-2015
+    #   appveyor_build_worker_image: Visual Studio 2015
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2017
+    #   appveyor_build_worker_image: Visual Studio 2017
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2019
+    #   appveyor_build_worker_image: Visual Studio 2019
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2022
+    #   appveyor_build_worker_image: Visual Studio 2022
+    #   FEATURE: HUGE
+
 # disabled
 #    - FEATURE: TINY
-#    - FEATURE: SMALL
 #    - FEATURE: NORMAL
 #    - FEATURE: BIG

@@ -15,20 +35,19 @@ matrix:
  fast_finish: true

 before_build:
-  # Use Windows SDK 7.1 (= MSVC 2010)
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'
+  - call ver
+  - ci\appveyor.bat install

 build_script:
-  - ci/appveyor.bat
+  - ci\appveyor.bat build

 test_script:
-  - cd src/testdir
-    # Testing with MSVC gvim
-  - path C:\Python35-x64;%PATH%
-  - nmake -f Make_dos.mak VIMPROG=..\gvim
-  - nmake -f Make_dos.mak clean
-    # Testing with MSVC console version
-  - nmake -f Make_dos.mak VIMPROG=..\vim
+  - ci\appveyor.bat test
+
+artifacts:
+  - path: src/vim.exe
+    name: vim
+  - path: src/gvim.exe
+    name: gvim

 # vim: sw=2 sts=2 et ts=8 sr
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,10 +8,9 @@ freebsd_task:
    - name: FreeBSD 13.1
      freebsd_instance:
        image_family: freebsd-13-1
-    - name: FreeBSD 12.3
+    - name: FreeBSD 12.4
      freebsd_instance:
-        image_family: freebsd-12-3
-  only_if: $CIRRUS_TAG == ''
+        image_family: freebsd-12-4
  timeout_in: 20m
  install_script:
    - pkg update -f
@@ -26,3 +25,22 @@ freebsd_task:
    - pw useradd cirrus -m
    - chown -R cirrus:cirrus .
    - sudo -u cirrus make test
+
+macos_task:
+  name: macOS m1
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  env:
+    # only run with clang, gcc is not real, it is a link to clang
+    CC: clang
+  timeout_in: 20m
+  install_script:
+    - brew update
+    - brew install gettext libtool diffutils
+  build_script:
+    - NPROC=$(getconf _NPROCESSORS_ONLN)
+    - ./configure --with-features=${FEATURES}
+    - make -j${NPROC}
+  test_script:
+    - src/vim --version
+    - make test
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,9 +11,12 @@

 runtime/autoload/freebasic.vim		@dkearns
 runtime/autoload/getscript.vim		@cecamp
+runtime/autoload/haskell.vim		@alx741
+runtime/autoload/javascript.vim		@jsit
 runtime/autoload/netrw.vim		@cecamp
 runtime/autoload/netrwFileHandlers.vim	@cecamp
 runtime/autoload/netrwSettings.vim	@cecamp
+runtime/autoload/php.vim		@david-szabo97
 runtime/autoload/rubycomplete.vim	@segfault @dkearns
 runtime/autoload/tar.vim		@cecamp
 runtime/autoload/vimball.vim		@cecamp
@@ -26,17 +29,24 @@ runtime/colors/delek.vim		@habamax @romainl @neutaaaaan
 runtime/colors/desert.vim		@habamax @romainl @neutaaaaan
 runtime/colors/elflord.vim		@habamax @romainl @neutaaaaan
 runtime/colors/evening.vim		@habamax @romainl @neutaaaaan
+runtime/colors/habamax.vim		@habamax @romainl @neutaaaaan
 runtime/colors/industry.vim		@habamax @romainl @neutaaaaan
 runtime/colors/koehler.vim		@habamax @romainl @neutaaaaan
+runtime/colors/lunaperche.vim		@habamax @romainl @neutaaaaan
 runtime/colors/morning.vim		@habamax @romainl @neutaaaaan
 runtime/colors/murphy.vim		@habamax @romainl @neutaaaaan
 runtime/colors/pablo.vim		@habamax @romainl @neutaaaaan
 runtime/colors/peachpuff.vim		@habamax @romainl @neutaaaaan
+runtime/colors/quiet.vim		@habamax @romainl @neutaaaaan
+runtime/colors/retrobox.vim		@habamax @romainl @neutaaaaan
 runtime/colors/ron.vim			@habamax @romainl @neutaaaaan
 runtime/colors/shine.vim		@habamax @romainl @neutaaaaan
 runtime/colors/slate.vim		@habamax @romainl @neutaaaaan
+runtime/colors/sorbet.vim		@habamax @romainl @neutaaaaan
 runtime/colors/tools			@habamax @romainl @neutaaaaan
 runtime/colors/torte.vim		@habamax @romainl @neutaaaaan
+runtime/colors/wildcharm.vim		@habamax @romainl @neutaaaaan
+runtime/colors/zaibatsu.vim		@habamax @romainl @neutaaaaan
 runtime/colors/zellner.vim		@habamax @romainl @neutaaaaan
 runtime/compiler/checkstyle.vim		@dkearns
 runtime/compiler/cm3.vim		@dkearns
@@ -48,11 +58,14 @@ runtime/compiler/dartanalyser.vim	@dkearns
 runtime/compiler/dartdevc.vim		@dkearns
 runtime/compiler/dartdoc.vim		@dkearns
 runtime/compiler/dartfmt.vim		@dkearns
+runtime/compiler/dotnet.vim		@nickspoons
 runtime/compiler/eruby.vim		@dkearns
 runtime/compiler/fbc.vim		@dkearns
 runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
+runtime/compiler/go.vim			@dbarnett
 runtime/compiler/haml.vim		@tpope
+runtime/compiler/hare.vim		@rsaihe
 runtime/compiler/icon.vim		@dkearns
 runtime/compiler/javac.vim		@dkearns
 runtime/compiler/jest.vim		@dkearns
@@ -65,6 +78,10 @@ runtime/compiler/perlcritic.vim		@petdance @dkearns
 runtime/compiler/php.vim		@dkearns
 runtime/compiler/podchecker.vim		@petdance @dkearns
 runtime/compiler/powershell.vim		@heaths
+runtime/compiler/raco.vim		@benknoble
+runtime/compiler/racomake.vim		@benknoble
+runtime/compiler/racosetup.vim		@benknoble
+runtime/compiler/racotest.vim		@benknoble
 runtime/compiler/rake.vim		@tpope @dkearns
 runtime/compiler/rhino.vim		@dkearns
 runtime/compiler/rspec.vim		@tpope @dkearns
@@ -72,6 +89,7 @@ runtime/compiler/rubocop.vim		@dkearns
 runtime/compiler/ruby.vim		@tpope @dkearns
 runtime/compiler/rubyunit.vim		@dkearns
 runtime/compiler/sass.vim		@tpope
+runtime/compiler/sdoc.vim		@gpanders
 runtime/compiler/se.vim			@dkearns
 runtime/compiler/shellcheck.vim		@dkearns
 runtime/compiler/sml.vim		@dkearns
@@ -93,35 +111,60 @@ runtime/doc/pi_tar.txt			@cecamp
 runtime/doc/pi_vimball.txt		@cecamp
 runtime/doc/pi_zip.txt			@cecamp
 runtime/doc/ps1.txt			@heaths
+runtime/ftplugin/abaqus.vim		@costerwi
+runtime/ftplugin/apache.vim		@dubgeiser 
 runtime/ftplugin/awk.vim		@dkearns
 runtime/ftplugin/basic.vim		@dkearns
 runtime/ftplugin/bst.vim		@tpope
 runtime/ftplugin/cfg.vim		@chrisbra
+runtime/ftplugin/chatito.vim		@ObserverOfTime
 runtime/ftplugin/clojure.vim		@axvr
+runtime/ftplugin/cs.vim			@nickspoons
 runtime/ftplugin/csh.vim		@dkearns
 runtime/ftplugin/css.vim		@dkearns
 runtime/ftplugin/cucumber.vim		@tpope
+runtime/ftplugin/desktop.vim		@e-kwsm
 runtime/ftplugin/dosbatch.vim		@mrdubya
 runtime/ftplugin/eiffel.vim		@dkearns
+runtime/ftplugin/elixir.vim		@mhanberg
+runtime/ftplugin/erlang.vim		@hcs42
 runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/expect.vim		@dkearns
+runtime/ftplugin/fennel.vim		@gpanders
+runtime/ftplugin/fetchmail.vim		@dkearns
 runtime/ftplugin/fpcmake.vim		@dkearns
 runtime/ftplugin/freebasic.vim		@dkearns
+runtime/ftplugin/fstab.vim		@rid9
+runtime/ftplugin/gdb.vim		@xeyownt
+runtime/ftplugin/gdscript.vim		@habamax
+runtime/ftplugin/gdshader.vim		@habamax
 runtime/ftplugin/git.vim		@tpope
+runtime/ftplugin/gitattributes.vim	@ObserverOfTime
 runtime/ftplugin/gitcommit.vim		@tpope
 runtime/ftplugin/gitconfig.vim		@tpope
+runtime/ftplugin/gitignore.vim		@ObserverOfTime
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gyp.vim		@ObserverOfTime
+runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
+runtime/ftplugin/hare.vim		@rsaihe
 runtime/ftplugin/hgcommit.vim		@k-takata
+runtime/ftplugin/html.vim		@dkearns
 runtime/ftplugin/i3config.vim		@hiqua
 runtime/ftplugin/icon.vim		@dkearns
 runtime/ftplugin/indent.vim		@dkearns
+runtime/ftplugin/j.vim			@glts
 runtime/ftplugin/javascript.vim		@dkearns
 runtime/ftplugin/javascriptreact.vim	@dkearns
+runtime/ftplugin/jsonc.vim		@izhakjakov
+runtime/ftplugin/julia.vim		@carlobaldassi
 runtime/ftplugin/kconfig.vim		@chrisbra
+runtime/ftplugin/less.vim		@genoma
 runtime/ftplugin/liquid.vim		@tpope
 runtime/ftplugin/lua.vim		@dkearns
+runtime/ftplugin/lynx.vim		@dkearns
 runtime/ftplugin/m3build.vim		@dkearns
 runtime/ftplugin/m3quake.vim		@dkearns
 runtime/ftplugin/markdown.vim		@tpope
@@ -132,21 +175,37 @@ runtime/ftplugin/nginx.vim		@chr4
 runtime/ftplugin/nroff.vim		@a-vrma
 runtime/ftplugin/nsis.vim		@k-takata
 runtime/ftplugin/octave.vim		@dkearns
+runtime/ftplugin/openvpn.vim		@ObserverOfTime
 runtime/ftplugin/pascal.vim		@dkearns
 runtime/ftplugin/pbtxt.vim		@lakshayg
-runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pdf.vim		@tpope
+runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pod.vim		@petdance @dkearns
+runtime/ftplugin/poefilter.vim		@ObserverOfTime
 runtime/ftplugin/postscr.vim		@mrdubya
 runtime/ftplugin/ps1.vim		@heaths
 runtime/ftplugin/ps1xml.vim		@heaths
+runtime/ftplugin/python.vim		@tpict
 runtime/ftplugin/qb64.vim		@dkearns
+runtime/ftplugin/r.vim			@jalvesaq
+runtime/ftplugin/racket.vim		@benknoble
+runtime/ftplugin/readline.vim		@dkearns
+runtime/ftplugin/rhelp.vim		@jalvesaq
+runtime/ftplugin/rmd.vim		@jalvesaq
+runtime/ftplugin/rnoweb.vim		@jalvesaq
 runtime/ftplugin/routeros.vim		@zainin
+runtime/ftplugin/rrst.vim		@jalvesaq
+runtime/ftplugin/rst.vim		@marshallward
 runtime/ftplugin/ruby.vim		@tpope @dkearns
 runtime/ftplugin/sass.vim		@tpope
+runtime/ftplugin/scala.vim		@derekwyatt
 runtime/ftplugin/scss.vim		@tpope
+runtime/ftplugin/sdoc.vim		@gpanders
+runtime/ftplugin/sh.vim			@dkearns
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/ssa.vim		@ObserverOfTime
+runtime/ftplugin/swayconfig.vim		@jamespeapen
 runtime/ftplugin/systemverilog.vim	@Kocha
 runtime/ftplugin/tap.vim		@petdance
 runtime/ftplugin/tcsh.vim		@dkearns
@@ -156,32 +215,53 @@ runtime/ftplugin/toml.vim		@averms
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/vdf.vim		@ObserverOfTime
+runtime/ftplugin/wast.vim		@rhysd
 runtime/ftplugin/wget.vim		@dkearns
 runtime/ftplugin/wget2.vim		@dkearns
 runtime/ftplugin/xml.vim		@chrisbra
 runtime/ftplugin/xs.vim			@petdance
 runtime/ftplugin/zsh.vim		@chrisbra
+runtime/import/dist/vimhighlight.vim	@lacygoill
 runtime/indent/basic.vim		@dkearns
 runtime/indent/bst.vim			@tpope
 runtime/indent/cdl.vim			@dkearns
+runtime/indent/chatito.vim		@ObserverOfTime
 runtime/indent/clojure.vim		@axvr
 runtime/indent/config.vim		@dkearns
+runtime/indent/cs.vim			@nickspoons
 runtime/indent/css.vim			@dkearns
 runtime/indent/cucumber.vim		@tpope
 runtime/indent/d.vim			@dkearns
 runtime/indent/dosbatch.vim		@k-takata
 runtime/indent/dtd.vim			@dkearns
 runtime/indent/dylan.vim		@dkearns
+runtime/indent/eiffel.vim		@jocelyn
 runtime/indent/elm.vim			@andys8
+runtime/indent/erlang.vim		@hcs42
 runtime/indent/eruby.vim		@tpope @dkearns
 runtime/indent/eterm.vim		@dkearns
+runtime/indent/falcon.vim		@steveno
 runtime/indent/framescript.vim		@dkearns
 runtime/indent/freebasic.vim		@dkearns
+runtime/indent/gdscript.vim		@habamax
 runtime/indent/gitconfig.vim		@tpope
+runtime/indent/gitolite.vim		@sitaramc
+runtime/indent/go.vim			@dbarnett
+runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
+runtime/indent/hare.vim			@rsaihe
 runtime/indent/idlang.vim		@dkearns
+runtime/indent/j.vim			@glts
+runtime/indent/java.vim			@xuhdev
+runtime/indent/javascript.vim		@bounceme
+runtime/indent/json.vim			@elzr
+runtime/indent/jsonc.vim		@izhakjakov
+runtime/indent/julia.vim		@carlobaldassi
 runtime/indent/ld.vim			@dkearns
+runtime/indent/less.vim			@genoma
 runtime/indent/liquid.vim		@tpope
+runtime/indent/lua.vim			@marcuscf
 runtime/indent/make.vim			@dkearns
 runtime/indent/meson.vim		@Liambeguin
 runtime/indent/mma.vim			@dkearns
@@ -189,21 +269,34 @@ runtime/indent/nginx.vim		@chr4
 runtime/indent/nsis.vim			@k-takata
 runtime/indent/occam.vim		@dkearns
 runtime/indent/perl.vim			@petdance
+runtime/indent/php.vim			@2072
 runtime/indent/postscr.vim		@mrdubya
 runtime/indent/prolog.vim		@dkearns
 runtime/indent/ps1.vim			@heaths
 runtime/indent/qb64.vim			@dkearns
+runtime/indent/r.vim			@jalvesaq
+runtime/indent/racket.vim		@benknoble
 runtime/indent/readline.vim		@dkearns
+runtime/indent/rhelp.vim		@jalvesaq
+runtime/indent/rmd.vim			@jalvesaq
+runtime/indent/rnoweb.vim		@jalvesaq
+runtime/indent/rrst.vim			@jalvesaq
 runtime/indent/ruby.vim			@AndrewRadev @dkearns
 runtime/indent/sass.vim			@tpope
+runtime/indent/scala.vim		@derekwyatt
 runtime/indent/scss.vim			@tpope
 runtime/indent/sh.vim			@chrisbra
 runtime/indent/systemverilog.vim	@Kocha
 runtime/indent/tcl.vim			@dkearns
 runtime/indent/tcsh.vim			@dkearns
 runtime/indent/teraterm.vim		@k-takata
+runtime/indent/typescript.vim		@HerringtonDarkholme
+runtime/indent/vroom.vim		@dbarnett
+runtime/indent/wast.vim			@rhysd
 runtime/indent/xml.vim			@chrisbra
 runtime/indent/zsh.vim			@chrisbra
+runtime/keymap/armenian-eastern_utf-8.vim	@blinskey
+runtime/keymap/armenian-western_utf-8.vim	@blinskey
 runtime/keymap/tamil_tscii.vim		@yegappan
 runtime/lang/menu_en_gb.latin1.vim	@mrdubya
 runtime/pack/dist/opt/cfilter/plugin/cfilter.vim	@yegappan
@@ -214,71 +307,121 @@ runtime/plugin/netrwPlugin.vim		@cecamp
 runtime/plugin/tarPlugin.vim		@cecamp
 runtime/plugin/vimballPlugin.vim	@cecamp
 runtime/plugin/zipPlugin.vim		@cecamp
+runtime/plugin/manpager.vim		@Konfekt
+runtime/syntax/shared/hgcommitDiff.vim		@vegerot
+runtime/syntax/abaqus.vim		@costerwi
 runtime/syntax/aidl.vim			@dpelle
 runtime/syntax/amiga.vim		@cecamp
 runtime/syntax/arduino.vim		@johshoff
+runtime/syntax/asciidoc.vim		@aerostitch
 runtime/syntax/asm.vim			@dkearns
 runtime/syntax/asmh8300.vim		@dkearns
 runtime/syntax/asterisk.vim		@jaunis
+runtime/syntax/autohotkey.vim		@mmikeww
 runtime/syntax/awk.vim			@dkearns
 runtime/syntax/basic.vim		@dkearns
 runtime/syntax/bst.vim			@tpope
+runtime/syntax/bzl.vim			@dbarnett
+runtime/syntax/bzr.vim			@hdima
 runtime/syntax/cabal.vim		@coot
 runtime/syntax/cabalconfig.vim		@coot
 runtime/syntax/cabalproject.vim		@coot
+runtime/syntax/cf.vim			@ernstvanderlinden
+runtime/syntax/chatito.vim		@ObserverOfTime
 runtime/syntax/clojure.vim		@axvr
 runtime/syntax/cs.vim			@nickspoons
 runtime/syntax/csh.vim			@cecamp
 runtime/syntax/cucumber.vim		@tpope
+runtime/syntax/d.vim			@JesseKPhillips
+runtime/syntax/dart.vim			@pr3d4t0r
 runtime/syntax/datascript.vim		@dpelle
 runtime/syntax/dcl.vim			@cecamp
 runtime/syntax/desktop.vim		@e-kwsm
 runtime/syntax/dosbatch.vim		@mrdubya
+runtime/syntax/dosini.vim		@xuhdev
 runtime/syntax/dot.vim			@mmottl
 runtime/syntax/doxygen.vim		@frogonwheels
 runtime/syntax/dtd.vim			@chrisbra
 runtime/syntax/dts.vim			@zonque
+runtime/syntax/editorconfig.vim		@gpanders
+runtime/syntax/eiffel.vim		@jocelyn
 runtime/syntax/elmfilt.vim		@cecamp
+runtime/syntax/erlang.vim		@hcs42
 runtime/syntax/eruby.vim		@tpope @dkearns
+runtime/syntax/expect.vim		@dkearns
 runtime/syntax/exports.vim		@cecamp
+runtime/syntax/falcon.vim		@steveno
+runtime/syntax/fennel.vim		@gpanders
+runtime/syntax/fetchmail.vim		@dkearns
+runtime/syntax/forth.vim		@jkotlinski
 runtime/syntax/fpcmake.vim		@dkearns
+runtime/syntax/freebasic.vim		@dkearns
+runtime/syntax/fstab.vim		@rid9
+runtime/syntax/gdresource.vim		@habamax
+runtime/syntax/gdscript.vim		@habamax
+runtime/syntax/gdshader.vim		@habamax
 runtime/syntax/git.vim			@tpope
+runtime/syntax/gitattributes.vim	@ObserverOfTime
 runtime/syntax/gitcommit.vim		@tpope
 runtime/syntax/gitconfig.vim		@tpope
+runtime/syntax/gitignore.vim		@ObserverOfTime
+runtime/syntax/gitolite.vim		@sitaramc
 runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/go.vim			@bhcleek
+runtime/syntax/godoc.vim		@dbarnett
 runtime/syntax/gprof.vim		@dpelle
 runtime/syntax/groff.vim		@jmarshall
+runtime/syntax/gyp.vim			@ObserverOfTime
 runtime/syntax/haml.vim			@tpope
+runtime/syntax/hare.vim			@rsaihe
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
+runtime/syntax/hitest.vim		@lacygoill
+runtime/syntax/hollywood.vim		@sodero
+runtime/syntax/html.vim			@dkearns
 runtime/syntax/i3config.vim		@hiqua
 runtime/syntax/icon.vim			@dkearns
 runtime/syntax/indent.vim		@dkearns
+runtime/syntax/j.vim			@glts
+runtime/syntax/jargon.vim		@h3xx
+runtime/syntax/java.vim			@fleiner
+runtime/syntax/javascript.vim		@fleiner
+runtime/syntax/jsonc.vim		@izhakjakov
+runtime/syntax/julia.vim		@carlobaldassi
 runtime/syntax/kconfig.vim		@chrisbra
 runtime/syntax/less.vim			@genoma
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
+runtime/syntax/lua.vim			@marcuscf
+runtime/syntax/lyrics.vim		@ObserverOfTime
 runtime/syntax/lynx.vim			@dkearns
 runtime/syntax/m3build.vim		@dkearns
 runtime/syntax/m3quake.vim		@dkearns
 runtime/syntax/mailcap.vim		@dkearns
 runtime/syntax/make.vim			@rohieb
+runtime/syntax/mallard.vim		@jhradilek
 runtime/syntax/maple.vim		@cecamp
 runtime/syntax/markdown.vim		@tpope
 runtime/syntax/mason.vim		@petdance
 runtime/syntax/meson.vim		@Liambeguin
 runtime/syntax/modula3.vim		@dkearns
+runtime/syntax/n1ql.vim			@pr3d4t0r
 runtime/syntax/netrw.vim		@cecamp
 runtime/syntax/nginx.vim		@chr4
+runtime/syntax/ninja.vim		@nico
+runtime/syntax/nix.vim			@equill
 runtime/syntax/nroff.vim		@jmarshall
 runtime/syntax/nsis.vim			@k-takata
+runtime/syntax/openvpn.vim		@ObserverOfTime
 runtime/syntax/pascal.vim		@dkearns
 runtime/syntax/pbtxt.vim		@lakshayg
 runtime/syntax/pdf.vim			@tpope
 runtime/syntax/perl.vim			@petdance
 runtime/syntax/php.vim			@TysonAndre
+runtime/syntax/plsql.vim		@lee-lindley
 runtime/syntax/pod.vim			@petdance
+runtime/syntax/poefilter.vim		@ObserverOfTime
 runtime/syntax/postscr.vim		@mrdubya
 runtime/syntax/privoxy.vim		@dkearns
 runtime/syntax/prolog.vim		@XVilka
@@ -286,20 +429,39 @@ runtime/syntax/ps1.vim			@heaths
 runtime/syntax/ps1xml.vim		@heaths
 runtime/syntax/psl.vim			@danielkho
 runtime/syntax/qb64.vim			@dkearns
+runtime/syntax/r.vim			@jalvesaq
+runtime/syntax/racket.vim		@benknoble
+runtime/syntax/raml.vim			@in3d
+runtime/syntax/ratpoison.vim		@trapd00r
 runtime/syntax/rc.vim			@chrisbra
+runtime/syntax/rcs.vim			@hdima
 runtime/syntax/rebol.vim		@mrdubya
+runtime/syntax/rego.vim			@zenmatic
+runtime/syntax/resolv.vim		@rid9
+runtime/syntax/rmd.vim			@jalvesaq
+runtime/syntax/rng.vim			@jhradilek
 runtime/syntax/routeros.vim		@zainin
 runtime/syntax/rpcgen.vim		@cecamp
+runtime/syntax/rrst.vim			@jalvesaq
+runtime/syntax/rst.vim			@marshallward
 runtime/syntax/ruby.vim			@dkearns
 runtime/syntax/sass.vim			@tpope
+runtime/syntax/scala.vim		@derekwyatt
 runtime/syntax/scss.vim			@tpope
+runtime/syntax/sdoc.vim			@gpanders
+runtime/syntax/sed.vim			@dkearns
 runtime/syntax/sh.vim			@cecamp
 runtime/syntax/sm.vim			@cecamp
 runtime/syntax/spec.vim			@ignatenkobrain
 runtime/syntax/sqloracle.vim		@chrisbra
+runtime/syntax/squirrel.vim		@zenmatic
+runtime/syntax/srt.vim			@ObserverOfTime
+runtime/syntax/ssa.vim			@ObserverOfTime
 runtime/syntax/sshconfig.vim		@Jakuje
 runtime/syntax/sshdconfig.vim		@Jakuje
 runtime/syntax/sudoers.vim		@e-kwsm
+runtime/syntax/svn.vim			@hdima
+runtime/syntax/swayconfig.vim		@jamespeapen
 runtime/syntax/systemverilog.vim	@Kocha
 runtime/syntax/tags.vim			@cecamp
 runtime/syntax/tap.vim			@petdance
@@ -312,7 +474,14 @@ runtime/syntax/toml.vim			@averms
 runtime/syntax/tt2.vim			@petdance
 runtime/syntax/tt2html.vim		@petdance
 runtime/syntax/tt2js.vim		@petdance
+runtime/syntax/typescript.vim		@HerringtonDarkholme
+runtime/syntax/typescriptcommon.vim	@HerringtonDarkholme
+runtime/syntax/typescriptreact.vim	@HerringtonDarkholme
+runtime/syntax/vdf.vim			@ObserverOfTime
 runtime/syntax/vim.vim			@cecamp
+runtime/syntax/vroom.vim		@dbarnett
+runtime/syntax/wast.vim			@rhysd
+runtime/syntax/wdl.vim			@zenmatic
 runtime/syntax/wget.vim			@dkearns
 runtime/syntax/wget2.vim		@dkearns
 runtime/syntax/xbl.vim			@dkearns
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,16 +12,21 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
  cancel-in-progress: true

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04

    env:
      CC: ${{ matrix.compiler }}
+      GCC_VER: 13
+      CLANG_VER: 16
      TEST: test
      SRCDIR: ./src
      LEAK_CFLAGS: -DEXITFREE
-      CFLAGS: -Wno-error=deprecated-declarations
+      CFLAGS: -Wno-deprecated-declarations
      LOG_DIR: ${{ github.workspace }}/logs
      TERM: xterm
      DISPLAY: ':99'
@@ -30,7 +35,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        features: [tiny, small, normal, huge]
+        features: [tiny, normal, huge]
        compiler: [clang, gcc]
        extra: [none]
        include:
@@ -78,37 +83,36 @@ jobs:
              lcov \
              libcanberra-dev \
              libperl-dev \
-              python-dev \
+              python2-dev \
              python3-dev \
-              liblua5.3-dev \
-              lua5.3 \
+              liblua5.4-dev \
+              lua5.4 \
              ruby-dev \
              tcl-dev \
              cscope \
              libsodium-dev \
            )
          fi
-          sudo apt update && sudo apt install -y "${PKGS[@]}"
+          sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"

-      - name: Install gcc-11
+      - name: Install gcc-${{ env.GCC_VER }}
        if:  matrix.compiler == 'gcc'
        run: |
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo apt install -y gcc-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
-          sudo update-alternatives --set gcc /usr/bin/gcc-11
+          sudo apt-get install -y gcc-${{ env.GCC_VER }}
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
+          sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}

-      - name: Install clang-14
+      - name: Install clang-${{ env.CLANG_VER }}
        if: matrix.compiler == 'clang'
        run: |
          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
          . /etc/lsb-release
-          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-14 main"
-          sudo apt install -y clang-14 llvm-14
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
-          sudo update-alternatives --set clang /usr/bin/clang-14
-          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-14 100
-          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-14 100
+          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-${{ env.CLANG_VER }} main"
+          sudo apt-get install -y clang-${{ env.CLANG_VER }} llvm-${{ env.CLANG_VER }}
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 100
+          sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }}
+          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${{ env.CLANG_VER }} 100
+          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-${{ env.CLANG_VER }} 100

      - name: Set up environment
        run: |
@@ -118,11 +122,10 @@ jobs:
          (
          echo "LINUX_VERSION=$(uname -r)"
          echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-          echo "SND_DUMMY_DIR=${HOME}/snd-dummy"
          echo "TMPDIR=${{ runner.temp }}"

          case "${{ matrix.features }}" in
-          tiny|small)
+          tiny)
            echo "TEST=testtiny"
            if ${{ contains(matrix.extra, 'nogui') }}; then
              echo "CONFOPT=--disable-gui"
@@ -167,31 +170,25 @@ jobs:
            # Use llvm-cov instead of gcov when compiler is clang.
            ln -fs /usr/bin/llvm-cov ${HOME}/bin/gcov
          fi
-          # Setup lua5.3 manually since its package doesn't provide alternative.
-          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-          if [[ ${CONFOPT} =~ luainterp ]]; then
-            sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-          fi
          sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
          sudo usermod -a -G audio "${USER}"
          sudo bash ci/setup-xvfb.sh

-      - name: Cache snd-dummy
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.SND_DUMMY_DIR }}
-          key: linux-${{ env.LINUX_VERSION }}-snd-dummy
-
      - name: Set up snd-dummy
+        if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
+        env:
+          DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
        run: |
-          if [[ ! -e ${SND_DUMMY_DIR}/snd-dummy.ko ]]; then
-            bash ci/build-snd-dummy.sh
+          cd /lib/modules/${{ env.LINUX_VERSION }}
+          if apt-cache show linux-modules-extra-${{ env.LINUX_VERSION }} >/dev/null 2>&1 ; then
+          sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
+          sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
+          tar -cvC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
+          sudo depmod --verbose
+          sudo modprobe --verbose snd-dummy
+          else
+          echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't seem to exist, continue anyway"; exit 0
          fi
-          cd "${SND_DUMMY_DIR}"
-          sudo insmod soundcore.ko
-          sudo insmod snd.ko
-          sudo insmod snd-pcm.ko
-          sudo insmod snd-dummy.ko

      - name: Check autoconf
        if: contains(matrix.extra, 'unittests')
@@ -234,19 +231,6 @@ jobs:
          do_test() { sg audio "sg $(id -gn) '$*'"; }
          do_test make ${SHADOWOPT} ${TEST}

-      # - name: Coveralls
-      #   if: matrix.coverage && github.event_name != 'pull_request'
-      #   env:
-      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      #     COVERALLS_PARALLEL: true
-      #     TRAVIS_JOB_ID: ${{ github.run_id }}
-      #   run: |
-      #     sudo apt-get install -y python3-setuptools python3-wheel
-      #     sudo -H pip3 install pip -U
-      #     # needed for https support for coveralls building cffi only works with gcc, not with clang
-      #     CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
-      #     ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
-
      - name: Generate gcov files
        if: matrix.coverage
        run: |
@@ -254,8 +238,9 @@ jobs:
          find . -type f -name '*.gcno' -exec gcov -pb {} + || true

      - name: Codecov
+        timeout-minutes: 20
        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3
        with:
          flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}

@@ -267,19 +252,6 @@ jobs:
            false # in order to fail a job
          done

-  # coveralls:
-  #   runs-on: ubuntu-18.04
-  #
-  #   needs: linux
-  #   if: always() && github.event_name != 'pull_request'
-  #
-  #   steps:
-  #     - name: Parallel finished
-  #       env:
-  #         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-  #       run: |
-  #         curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"
-
  macos:
    runs-on: macos-latest

@@ -301,11 +273,10 @@ jobs:

      - name: Install packages
        if: matrix.features == 'huge'
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
        run: |
          brew install lua
          echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
+          brew uninstall perl

      - name: Set up environment
        run: |
@@ -373,11 +344,17 @@ jobs:
      PYTHON_VER_DOT: '2.7'
      PYTHON_DIR: 'C:\Python27'
      # Python 3
-      PYTHON3_VER: 310
-      PYTHON3_VER_DOT: '3.10'
+      PYTHON3_VER: 311
+      PYTHON3_VER_DOT: '3.11'
      # Other dependencies
      # winpty
      WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
+      # libsodium
+      SODIUM_VER: '1.0.18'
+      SODIUM_MSVC_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-msvc.zip
+      SODIUM_MSVC_VER: v143
+      SODIUM_MINGW_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-mingw.tar.gz
+      SODIUM_MINGW_VER: 23
      # Escape sequences
      COL_RED: "\x1b[31m"
      COL_GREEN: "\x1b[32m"
@@ -387,51 +364,62 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        toolchain: [msvc, mingw]
-        arch: [x64, x86]
-        features: [HUGE, NORMAL]
        include:
-          - arch: x64
-            vcarch: amd64
-            warch: x64
-            bits: 64
-            msystem: MINGW64
-            cygreg: registry
-            pyreg: ""
-          - arch: x86
-            vcarch: x86
-            warch: ia32
-            bits: 32
-            msystem: MINGW32
-            cygreg: registry32
-            pyreg: "-32"
-          - toolchain: mingw
-            arch: x64
-            features: HUGE
-            coverage: yes
-        exclude:
-          - toolchain: msvc
-            arch: x64
-            features: NORMAL
-          - toolchain: mingw
-            arch: x86
-            features: NORMAL
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: no,  arch: x64 }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x86, coverage: yes }
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: yes, arch: x86 }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: no,  arch: x64, coverage: yes }
+          - { features: NORMAL, toolchain: msvc,  VIMDLL: yes, GUI: no,  arch: x86 }
+          - { features: NORMAL, toolchain: mingw, VIMDLL: no,  GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: msvc,  VIMDLL: yes, GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: mingw, VIMDLL: no,  GUI: no,  arch: x86 }

    steps:
      - name: Initialize
        id: init
        shell: bash
        run: |
+          # Show Windows version
+          cmd /c ver
+
          git config --global core.autocrlf input
-          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
-          if [ "${{ matrix.arch }}" = "x86" ]; then
-            choco install python2 --forcex86
+
+          if ${{ matrix.arch == 'x64' }}; then
+            cygreg=registry
+            pyreg=
+            echo "VCARCH=amd64" >> $GITHUB_ENV
+            echo "WARCH=x64" >> $GITHUB_ENV
+            echo "BITS=64" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW64" >> $GITHUB_ENV
          else
-            choco install python2
+            cygreg=registry32
+            pyreg=-32
+            echo "VCARCH=x86" >> $GITHUB_ENV
+            echo "WARCH=ia32" >> $GITHUB_ENV
+            echo "BITS=32" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW32" >> $GITHUB_ENV
          fi
-          python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
+
+          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
+          if ${{ matrix.features != 'TINY' }}; then
+            if ${{ matrix.arch == 'x86' }}; then
+              choco install python2 --no-progress --forcex86
+            else
+              choco install python2 --no-progress
+            fi
+          fi
+          python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")
          echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV

+          if ${{ matrix.toolchain == 'msvc' }}; then
+            SODIUM_DIR=D:\\libsodium
+            echo "SODIUM_LIB=${SODIUM_DIR}\\${{ matrix.arch == 'x64' && 'x64' || 'Win32' }}\\Release\\${SODIUM_MSVC_VER}\\dynamic" >> $GITHUB_ENV
+          else
+            SODIUM_DIR=D:\\libsodium-win${{ matrix.arch == 'x64' && '64' || '32' }}
+            echo "SODIUM_LIB=${SODIUM_DIR}\\bin" >> $GITHUB_ENV
+          fi
+          echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV
+
      - uses: msys2/setup-msys2@v2
        if: matrix.toolchain == 'mingw'
        with:
@@ -439,7 +427,7 @@ jobs:
          install: tar
          pacboy: >-
            make:p gcc:p
-          msystem: ${{ matrix.msystem }}
+          msystem: ${{ env.MSYSTEM }}
          release: false

      - name: Checkout repository from github
@@ -451,12 +439,13 @@ jobs:
          type NUL > urls.txt
          echo %LUA_RELEASE%>> urls.txt
          echo %WINPTY_URL%>> urls.txt
+          echo %SODIUM_VER%>> urls.txt

      - name: Cache downloaded files
        uses: actions/cache@v3
        with:
          path: downloads
-          key: ${{ runner.os }}-${{ matrix.bits }}-${{ hashFiles('urls.txt') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('urls.txt') }}

      - name: Download dependencies
        shell: cmd
@@ -465,14 +454,24 @@ jobs:
          if not exist downloads mkdir downloads

          echo %COL_GREEN%Download Lua%COL_RESET%
-          call :downloadfile %LUA${{ matrix.bits }}_URL% downloads\lua.zip
+          call :downloadfile %LUA${{ env.BITS }}_URL% downloads\lua.zip
          7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1

          echo %COL_GREEN%Download winpty%COL_RESET%
          call :downloadfile %WINPTY_URL% downloads\winpty.zip
          7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
-          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty.dll        src\winpty${{ matrix.bits }}.dll
-          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty-agent.exe  src\
+          copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
+          copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\
+
+          echo %COL_GREEN%Download libsodium%COL_RESET%
+          if "${{ matrix.toolchain }}"=="msvc" (
+            call :downloadfile %SODIUM_MSVC_URL% downloads\libsodium.zip
+            7z x -y downloads\libsodium.zip -oD:\ > nul || exit 1
+          ) else (
+            call :downloadfile %SODIUM_MINGW_URL% downloads\libsodium.tar.gz
+            7z x -y downloads\libsodium.tar.gz -so | 7z x -si -ttar -oD:\ > nul || exit 1
+            mklink %SODIUM_LIB%\libsodium.dll %SODIUM_LIB%\libsodium-%SODIUM_MINGW_VER%.dll
+          )

          goto :eof

@@ -487,31 +486,29 @@ jobs:
          )
          goto :eof

-      - name: Copy src directory to src2
-        shell: cmd
-        run: xcopy src src2\ /E > nul
-
      - name: Build (MSVC)
        if: matrix.toolchain == 'msvc'
        shell: cmd
        run: |
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
+          call "%VCVARSALL%" %VCARCH%
          cd src
+          if "${{ matrix.VIMDLL }}"=="yes" (
+            set GUI=yes
+          ) else (
+            set GUI=${{ matrix.GUI }}
+          )
          if "${{ matrix.features }}"=="HUGE" (
            nmake -nologo -f Make_mvc.mak ^
              FEATURES=${{ matrix.features }} ^
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
              DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
              DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
-              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
+              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
+              DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR%
          ) else (
            nmake -nologo -f Make_mvc.mak ^
              FEATURES=${{ matrix.features }} ^
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes
-          )
-          if not exist vim${{ matrix.bits }}.dll (
-            echo %COL_RED%Build failure.%COL_RESET%
-            exit 1
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }}
          )

      - name: Build (MinGW)
@@ -519,28 +516,44 @@ jobs:
        shell: msys2 {0}
        run: |
          cd src
+          if [ "${{ matrix.VIMDLL }}" = "yes" ]; then
+            GUI=yes
+          else
+            GUI=${{ matrix.GUI }}
+          fi
          if [ "${{ matrix.features }}" = "HUGE" ]; then
            mingw32-make -f Make_ming.mak -j2 \
              FEATURES=${{ matrix.features }} \
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
              DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
              DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
              DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
+              DYNAMIC_SODIUM=yes SODIUM=${SODIUM_DIR} \
              STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
          else
            mingw32-make -f Make_ming.mak -j2 \
              FEATURES=${{ matrix.features }} \
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
              STATIC_STDCPLUS=yes
          fi

      - name: Check version
        shell: cmd
        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          src\vim --version || exit 1
-          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
-          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          if "${{ matrix.GUI }}"=="yes" (
+            start /wait src\gvim -u NONE -i NONE -c "redir > version.txt | ver | q" || exit 1
+            type version.txt
+            echo.
+            start /wait src\gvim -u NONE -i NONE -c "redir! > version.txt | so ci\if_ver-1.vim | q"
+            start /wait src\gvim -u NONE -i NONE -c "redir >> version.txt | so ci\if_ver-2.vim | q"
+            type version.txt
+            del version.txt
+          ) else (
+            src\vim --version || exit 1
+            src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+            src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+          )

      #- name: Prepare Artifact
      #  shell: cmd
@@ -555,51 +568,39 @@ jobs:
      #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
      #    path: ./artifacts

-      - name: Copy gcov data files to src2
-        if: matrix.coverage
-        shell: msys2 {0}
-        run: find src -name '*.gcno' | tar -c -T - | tar -x -C src2 --strip-components 1
-
      - name: Test and show the result of testing gVim
+        if: matrix.GUI == 'yes' || matrix.VIMDLL == 'yes'
        shell: cmd
-        timeout-minutes: 20
+        timeout-minutes: 15
        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
-
-          echo %COL_GREEN%Start testing Vim in background.%COL_RESET%
-          start cmd /c "cd src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
+          call "%VCVARSALL%" %VCARCH%

          echo %COL_GREEN%Test gVim:%COL_RESET%
          cd src\testdir
-          nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
-
-      - name: Show the result of testing Vim
-        shell: cmd
-        timeout-minutes: 20
-        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
-
-          echo %COL_GREEN%Wait for Vim tests to finish.%COL_RESET%
-          cd src2\testdir
-          :: Wait about 10 minutes.
-          for /L %%i in (1,1,60) do (
-            if exist done.txt goto exitloop
-            timeout 10 > NUL 2>&1
-            if ERRORLEVEL 1 ping -n 11 localhost > NUL
+          if "${{ matrix.GUI }}"=="yes" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\gvim  || exit 1
          )
-          set timeout=1
-          :exitloop

-          echo %COL_GREEN%The result of testing Vim:%COL_RESET%
-          cd src2\testdir
-          if exist messages type messages
-          nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
+      - name: Test and show the result of testing Vim
+        if: matrix.GUI == 'no' || matrix.VIMDLL == 'yes'
+        shell: cmd
+        timeout-minutes: 15
+        run: |
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
+          call "%VCVARSALL%" %VCARCH%

-          if "%timeout%"=="1" (
-            echo %COL_RED%Timed out.%COL_RESET%
-            exit 1
+          echo %COL_GREEN%Test Vim:%COL_RESET%
+          cd src\testdir
+          nmake -nologo -f Make_mvc.mak clean
+          if "${{ matrix.GUI }}"=="no" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\vim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\vim  || exit 1
          )

      - name: Generate gcov files
@@ -608,19 +609,11 @@ jobs:
        run: |
          cd src
          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
-          cd ../src2
-          find . -type f -name '*.gcno' -exec gcov -pb {} + || true

-      - name: Codecov (gVim)
+      - name: Codecov
+        timeout-minutes: 20
        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3
        with:
          directory: src
-          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}-gui
-
-      - name: Codecov (Vim)
-        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
-        with:
-          directory: src2
          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,8 +21,15 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
  cancel-in-progress: true

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  analyze:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+      security-events: write #  (github/codeql-action/autobuild)
+
    name: Analyze
    runs-on: ubuntu-latest

--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -4,37 +4,43 @@ on:
    - cron: '42 0 * * *'  # Run once per day, to avoid Coverity's submission limits
  workflow_dispatch:

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  scan:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04

    env:
      CC: gcc
+      CFLAGS: -Wno-deprecated-declarations
      DEBIAN_FRONTEND: noninteractive
+      TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}

    steps:
      - name: Checkout repository from github
+        if: env.TOKEN
        uses: actions/checkout@v3

      - name: Download Coverity
+        if: env.TOKEN
        run: |
          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=vim" -O coverity_tool.tgz
          mkdir cov-scan
          tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}

      - name: Install packages
+        if: env.TOKEN
        run: |
-          sudo apt update && sudo apt install -y \
+          sudo apt-get update && sudo apt-get install -y \
            autoconf \
            gettext \
            libcanberra-dev \
            libperl-dev \
-            python-dev \
+            python2-dev \
            python3-dev \
-            liblua5.3-dev \
-            lua5.3 \
+            liblua5.4-dev \
+            lua5.4 \
            ruby-dev \
            tcl-dev \
            libgtk2.0-dev \
@@ -43,6 +49,7 @@ jobs:
            libsodium-dev

      - name: Set up environment
+        if: env.TOKEN
        run: |
          echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
          (
@@ -50,13 +57,8 @@ jobs:
          echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
          ) >> $GITHUB_ENV

-      - name: Set up system
-        run: |
-          # Setup lua5.3 manually since its package doesn't provide alternative.
-          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-          sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-
      - name: Configure
+        if: env.TOKEN
        run: |
          ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
          # Append various warning flags to CFLAGS.
@@ -64,10 +66,12 @@ jobs:
          sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk

      - name: Build/scan vim
+        if: env.TOKEN
        run: |
          cov-build --dir cov-int make -j${NPROC}

      - name: Submit results
+        if: env.TOKEN
        run: |
          tar zcf cov-scan.tgz cov-int
          curl --form token=$TOKEN \
@@ -77,5 +81,4 @@ jobs:
            --form description="Automatic GHA scan" \
            'https://scan.coverity.com/builds?project=vim'
        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
          EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
 nsis/icons/*
+/vim90/
+.vscode/

 # NetBeans
 nbproject/*
@@ -66,6 +68,7 @@ src/tags
 /GPATH
 /GTAGS
 /GRTAGS
+nsis/tags

 # Generated by "make test"
 src/po/*.ck
@@ -82,6 +85,8 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
+src/testdir/failed
+src/testdir/starttime
 runtime/indent/testdir/*.out
 runtime/indent/testdir/*.fail
 src/memfile_test
--- a/.hgignore
+++ b/.hgignore
@@ -7,9 +7,9 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
+src/auto/os_haiku.rdef
 src/objects/.dirstamp
 src/objects
-src/tags
 src/types.vim

 # We do need src/auto/configure.
@@ -46,12 +46,15 @@ gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
 nsis/icons/*
+/vim90/
+.vscode/

 # NetBeans
 nbproject/*

 # Mac OSX
 src/xxd/xxd.dSYM
+.DS_Store

 # All platforms
 *.rej
@@ -62,6 +65,12 @@ src/xxd/xxd.dSYM
 *.pyc
 *.log
 src/po/vim.pot
+src/tags
+/tags
+/GPATH
+/GTAGS
+/GRTAGS
+nsis/tags

 # Generated by "make test"
 src/po/*.ck
@@ -78,14 +87,16 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
+src/testdir/failed
+src/testdir/starttime
 runtime/indent/testdir/*.out
+runtime/indent/testdir/*.fail
 src/memfile_test
 src/json_test
 src/message_test
 src/kword_test

 # Generated by "make install"
-runtime/doc/tags
 runtime/doc/doctags

 # Generated by "make shadow".  The directory names could be anything but we
@@ -95,5 +106,10 @@ src/shadow-*
 src/runtime
 src/pixmaps

-# other possible files build by tools
+# other files possibly created by tools
 src/cscope.out
+
+# Linter/language server files
+/.cache/clangd/
+/.ccls-cache/
+/compile_commands.json
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -1,4 +0,0 @@
-# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-path_classifiers:
-  documentation:
-    - runtime/tutor/tutor*
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,288 +0,0 @@
-language: c
-
-env:
-  global:
-    - BUILD=yes TEST=test CONFOPT= LEAK_CFLAGS="-DEXITFREE" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no LOG_DIR="$TRAVIS_BUILD_DIR/logs"
-
-_anchors:
-  envs:
-    - &tiny-nogui
-      FEATURES=tiny TEST=testtiny CONFOPT="--disable-gui"
-    - &tiny
-      FEATURES=tiny TEST=testtiny
-    - &small
-      FEATURES=small TEST=testtiny
-    - &normal
-      FEATURES=normal
-    - &linux-huge
-      FEATURES=huge TEST="scripttests test_libvterm"
-      CONFOPT="--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
-    - &osx-huge # macOS build
-      FEATURES=huge
-      CONFOPT="--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
-    - &unittests
-      BUILD=no TEST=unittests FEATURES=huge CHECK_AUTOCONF=yes
-    - &coverage
-      CFLAGS="--coverage -DUSE_GCOV_FLUSH" LDFLAGS=--coverage
-    - &asan # ASAN build
-      SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize-recover=all -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
-      ASAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/asan" UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
-    - &shadowopt
-      SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
-
-  linux: &linux
-    os: linux
-    dist: bionic
-    addons:
-      apt:
-        packages: &apt-packages
-          - autoconf
-          - clang
-          - lcov
-          - gettext
-          - libcanberra-dev
-          - libperl-dev
-          - python-dev
-          - python3-dev
-          - liblua5.3-dev
-          - lua5.3
-          - ruby-dev
-          - tcl-dev
-          - cscope
-          - libgtk2.0-dev
-          - desktop-file-utils
-          - libtool-bin
-    services:
-      - xvfb
-    before_install:
-      - rvm reset
-      # Use llvm-cov instead of gcov when compiler is clang.
-      - |
-        if [[ "${CC}" = "clang" ]]; then
-          ln -sf "$(command -v llvm-cov)" /home/travis/bin/gcov
-        fi
-      # Setup lua5.3 manually since its package doesn't provide alternative.
-      # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-      - |
-        if [[ "${CONFOPT}" =~ luainterp ]]; then
-          sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-        fi
-    before_script:
-      - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
-      # It appears we can load "snd-dummy" on only amd64.
-      - |
-        if [[ "${TRAVIS_CPU_ARCH}" = amd64 ]]; then
-          sudo bash ci/load-snd-dummy.sh || true
-        fi
-      - sudo usermod -a -G audio $USER
-      - do_test() { sg audio "sg $(id -gn) '$*'"; }
-
-  osx: &osx
-    os: osx
-    before_script:
-      - do_test() { "$@"; }
-
-  homebrew: &osx-homebrew
-    addons:
-      homebrew:
-        packages:
-          - lua
-        update: true
-    cache:
-      directories:
-        - /usr/local/Homebrew/Library/Homebrew/vendor/
-        - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
-    before_install:
-      - rvm reset
-      # Lua is not installed on macOS
-      - export LUA_PREFIX=/usr/local
-
-  coverage: &eval-coverage
-    # needed for https support for coveralls building cffi only works with gcc,
-    # not with clang
-    - CC=gcc pip install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
-    - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
-    - (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash))
-
-  asan_symbolize: &asan_symbolize
-    # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd: asan_symbolize-6.0: Not a directory".
-    # https://github.com/pyenv/pyenv/issues/580
-    - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git rev-list --tags -n1)") &>/dev/null || true
-    - for f in $(grep -l '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*); do asan_symbolize-11 -l "$f"; done
-
-branches:
-  except:
-    - /^v[0-9]/
-
-script:
-  - mkdir -p "$LOG_DIR"
-  - NPROC=$(getconf _NPROCESSORS_ONLN)
-  - set -o errexit
-  - echo -e "\\033[33;1mConfiguring Vim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
-  - |
-    if [[ "${CHECK_AUTOCONF}" = "yes" ]] && [[ "${CC}" = "gcc" ]]; then
-      make -C src autoconf
-    fi
-  - |
-    if [[ -n "${SHADOWOPT}" ]]; then
-      make -C src shadow
-    fi
-  # "./configure" changes its working directory into "$SRCDIR".
-  - ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
-  - echo -en "travis_fold:end:configure\\r\\033[0K"
-  - echo -e "\\033[33;1mBuilding Vim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K"
-  - |
-    if [[ "${BUILD}" = "yes" ]]; then
-      # Append various warning flags to CFLAGS.
-      # BSD sed needs backup extension specified.
-      sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
-      if [[ "${TRAVIS_OS_NAME}" = "osx" ]] || [[ "${CC}" = "clang-11" ]]; then
-        # On macOS, the entity of gcc is clang.
-        sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
-      else
-        sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
-      fi
-      make ${SHADOWOPT} -j${NPROC}
-    fi
-  - echo -en "travis_fold:end:build\\r\\033[0K"
-  - set +o errexit
-  # Show Vim version and also if_xx versions.
-  - |
-    if [[ "${BUILD}" = "yes" ]]; then
-      "${SRCDIR}"/vim --version
-      "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
-      "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
-    fi
-  - echo -e "\\033[33;1mTesting Vim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
-  - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
-  - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
-  - |
-    # Not all sanitizers will cause the tests to fail.  This helps since we can
-    # see all the failures instead of just the first one, but we still want the
-    # test phase to fail if any sanitizer issues are detected.
-    if [[ -n "${ASAN_OPTIONS}" ]]; then
-      if grep -q '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*; then
-        false
-      fi
-    fi
-
-# Instead of using all environments with both compilers on both systems,
-# exclude some builds on mac os x and linux.
-# On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments.
-# Linux: 2 compilers on some of the environments + gcc on os390
-jobs:
-  include:
-    #- <<: *osx
-    #  name: tiny-nogui/clang
-    #  compiler: clang
-    #  env: *tiny-nogui
-    #- <<: *osx
-    #  name: tiny-nogui/gcc
-    #  compiler: gcc
-    #  env: *tiny-nogui
-    #- <<: *osx
-    #  <<: *osx-homebrew
-    #  name: huge/clang
-    #  compiler: clang
-    #  env: *osx-huge
-    #- <<: *osx
-    #  <<: *osx-homebrew
-    #  name: huge/gcc
-    #  compiler: gcc
-    #  env: *osx-huge
-    #- <<: *linux
-    #  name: tiny-nogui/clang
-    #  compiler: clang
-    #  env: *tiny-nogui
-    #- <<: *linux
-    #  name: tiny-nogui/gcc
-    #  compiler: gcc
-    #  env: *tiny-nogui
-    #- <<: *linux
-    #  name: tiny/clang
-    #  compiler: clang
-    #  env: *tiny
-    #- <<: *linux
-    #  name: tiny/gcc
-    #  compiler: gcc
-    #  env: *tiny
-    #- <<: *linux
-    #  name: small/gcc
-    #  compiler: gcc
-    #  env: *small
-    #- <<: *linux
-    #  name: normal+shadow/clang
-    #  compiler: clang
-    #  env:
-    #    - *normal
-    #    - *shadowopt
-    #- <<: *linux
-    #  name: normal+shadow/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *normal
-    #    - *shadowopt
-    - <<: *linux
-      arch: s390x
-      name: huge/gcc-s390x
-      compiler: gcc
-      env: *linux-huge
-      services: []
-    - <<: *linux
-      arch: arm64
-      name: huge/gcc-arm64
-      compiler: gcc
-      env: *linux-huge
-      services: []
-    #- <<: *linux
-    #  name: huge+coverage/clang
-    #  compiler: clang
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: huge+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux # ASAN
-    #  name: huge+asan/clang
-    #  compiler: clang-11
-    #  addons:
-    #    apt:
-    #      sources:
-    #        - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
-    #          key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    #      packages:
-    #        - *apt-packages
-    #        - clang-11
-    #  env:
-    #    - *linux-huge
-    #    - *asan
-    #  after_failure: *asan_symbolize
-    #- <<: *linux
-    #  name: huge-testgui+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #    - TEST="-C src testgui"
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: unittests+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *unittests
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: vimtags/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *normal
-    #    - TEST="-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
-
-# vim:set sts=2 sw=2 tw=0 et:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,9 +65,6 @@ If the maintainer does not respond, contact the vim-dev maillist.

 # Translations

-Translations of this CONTRIBUTING file:
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/CONTRIBUTING_ko.md)
-
 Translating messages and runtime files is very much appreciated!  These things
 can be translated:
 *   Messages in Vim, see [src/po/README.txt][1]
--- a/69
+++ b/69
@@ -12,17 +12,14 @@ SRC_ALL =	\
 		.github/workflows/ci.yml \
 		.github/workflows/codeql-analysis.yml \
 		.github/workflows/coverity.yml \
+		.github/dependabot.yml \
 		.gitignore \
 		.hgignore \
-		.lgtm.yml \
-		.travis.yml \
 		.appveyor.yml \
 		.codecov.yml \
 		ci/appveyor.bat \
-		ci/build-snd-dummy.sh \
 		ci/config.mk*.sed \
 		ci/if_ver*.vim \
-		ci/load-snd-dummy.sh \
 		ci/setup-xvfb.sh \
 		src/Make_all.mak \
 		src/README.md \
@@ -88,10 +85,11 @@ SRC_ALL =	\
 		src/job.c \
 		src/json.c \
 		src/json_test.c \
+		src/keymap.h \
 		src/kword_test.c \
 		src/list.c \
 		src/locale.c \
-		src/keymap.h \
+		src/logfile.c \
 		src/macros.h \
 		src/main.c \
 		src/map.c \
@@ -162,6 +160,7 @@ SRC_ALL =	\
 		src/version.h \
 		src/vim.h \
 		src/vim9.h \
+		src/vim9class.c \
 		src/vim9cmds.c \
 		src/vim9compile.c \
 		src/vim9execute.c \
@@ -172,13 +171,14 @@ SRC_ALL =	\
 		src/viminfo.c \
 		src/winclip.c \
 		src/window.c \
-		src/tee/tee.c \
 		src/xxd/xxd.c \
 		src/testdir/gen_opt_test.vim \
 		src/testdir/README.txt \
 		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
+		src/testdir/keycode_check.vim \
+		src/testdir/keycode_check.json \
 		src/testdir/lsan-suppress.txt \
 		src/testdir/sautest/autoload/*.vim \
 		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
@@ -211,6 +211,7 @@ SRC_ALL =	\
 		src/testdir/python_before/*.py \
 		src/testdir/pyxfile/*.py \
 		src/testdir/dumps/*.dump \
+		src/testdir/dumps/*.vim \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/test000 \
 		src/testdir/color_ramp.vim \
@@ -272,6 +273,7 @@ SRC_ALL =	\
 		src/proto/json.pro \
 		src/proto/list.pro \
 		src/proto/locale.pro \
+		src/proto/logfile.pro \
 		src/proto/main.pro \
 		src/proto/map.pro \
 		src/proto/mark.pro \
@@ -323,6 +325,7 @@ SRC_ALL =	\
 		src/proto/usercmd.pro \
 		src/proto/userfunc.pro \
 		src/proto/version.pro \
+		src/proto/vim9class.pro \
 		src/proto/vim9cmds.pro \
 		src/proto/vim9compile.pro \
 		src/proto/vim9execute.pro \
@@ -395,6 +398,7 @@ SRC_ALL =	\
 		src/libvterm/t/66screen_extent.test \
 		src/libvterm/t/67screen_dbl_wh.test \
 		src/libvterm/t/68screen_termprops.test \
+		src/libvterm/t/69screen_reflow.test \
 		src/libvterm/t/90vttest_01-movement-1.test \
 		src/libvterm/t/90vttest_01-movement-2.test \
 		src/libvterm/t/90vttest_01-movement-3.test \
@@ -488,7 +492,6 @@ SRC_UNIX =	\
 		src/vimtutor \
 		src/gvimtutor \
 		src/which.sh \
-		src/tee/Makefile \
 		src/xxd/Makefile \

 # source files for both DOS and Unix
@@ -517,7 +520,7 @@ SRC_DOS_UNIX =	\
 		src/proto/if_tcl.pro \
 		src/typemap \

-# source files for DOS (also in the extra archive)
+# source files for MS-Windows (also in the extra archive)
 SRC_DOS =	\
 		src/GvimExt/*.mak \
 		src/GvimExt/GvimExt.reg \
@@ -541,9 +544,11 @@ SRC_DOS =	\
 		tools/rename.bat \
 		src/bigvim.bat \
 		src/bigvim64.bat \
-		src/msvc2008.bat \
-		src/msvc2010.bat \
+		src/msvc-latest.bat \
 		src/msvc2015.bat \
+		src/msvc2017.bat \
+		src/msvc2019.bat \
+		src/msvc2022.bat \
 		src/msys32.bat \
 		src/msys64.bat \
 		src/dlldata.c \
@@ -556,7 +561,6 @@ SRC_DOS =	\
 		src/if_ole.cpp \
 		src/if_ole.h \
 		src/if_ole.idl \
-		src/if_perl_msvc/stdbool.h \
 		src/iscygpty.c \
 		src/iscygpty.h \
 		src/iid_ole.c \
@@ -571,6 +575,7 @@ SRC_DOS =	\
 		src/proto/os_win32.pro \
 		src/proto/os_mswin.pro \
 		src/testdir/Make_dos.mak \
+		src/testdir/Make_mvc.mak \
 		src/testdir/Make_ming.mak \
 		src/testdir/dos.vim \
 		src/uninstall.c \
@@ -579,7 +584,10 @@ SRC_DOS =	\
 		src/vimrun.c \
 		src/xpm_w32.c \
 		src/xpm_w32.h \
+		src/tee/Make_ming.mak \
 		src/tee/Make_mvc.mak \
+		src/tee/Makefile \
+		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
 		nsis/gvim.nsi \
@@ -587,30 +595,9 @@ SRC_DOS =	\
 		nsis/README.txt \
 		nsis/lang/*.nsi \
 		uninstall.txt \
-		src/VisVim/Commands.cpp \
-		src/VisVim/Commands.h \
-		src/VisVim/DSAddIn.cpp \
-		src/VisVim/DSAddIn.h \
-		src/VisVim/OleAut.cpp \
-		src/VisVim/OleAut.h \
-		src/VisVim/README_VisVim.txt \
-		src/VisVim/Reg.cpp \
-		src/VisVim/Register.bat \
-		src/VisVim/Resource.h \
-		src/VisVim/StdAfx.cpp \
-		src/VisVim/StdAfx.h \
-		src/VisVim/UnRegist.bat \
-		src/VisVim/VisVim.cpp \
-		src/VisVim/VisVim.def \
-		src/VisVim/VisVim.mak \
-		src/VisVim/VisVim.h \
-		src/VisVim/VisVim.odl \
-		src/VisVim/VisVim.rc \
-		src/VisVim/VsReadMe.txt \

 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN =	\
-		src/VisVim/Res/*.bmp \
 		src/tearoff.bmp \
 		src/tools.bmp \
 		src/vim*.ico \
@@ -621,10 +608,8 @@ SRC_DOS_BIN =	\
 		src/xpm/include/*.h \
 		src/xpm/x64/lib-vc14/libXpm.lib \
 		src/xpm/x64/lib/libXpm.a \
-		src/xpm/x64/lib/libXpm.lib \
 		src/xpm/x86/lib-vc14/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
-		src/xpm/x86/lib/libXpm.lib \
 		runtime/bitmaps/vim.ico \
 		nsis/icons.zip \

@@ -661,6 +646,7 @@ SRC_MAC =	\
 		src/os_mac_conv.c \
 		src/os_macosx.m \
 		src/proto/os_mac_conv.pro \
+		src/proto/os_macosx.pro \

 # source files for VMS (in the extra archive)
 SRC_VMS =	\
@@ -722,6 +708,7 @@ RT_ALL =	\
 		runtime/ftoff.vim \
 		runtime/gvimrc_example.vim \
 		runtime/import/dist/vimhelp.vim \
+		runtime/import/dist/vimhighlight.vim \
 		runtime/macros/README.txt \
 		runtime/macros/editexisting.vim \
 		runtime/macros/hanoi/click.me \
@@ -795,6 +782,7 @@ RT_SCRIPTS =	\
 		runtime/autoload/README.txt \
 		runtime/autoload/dist/*.vim \
 		runtime/autoload/xml/*.vim \
+		runtime/autoload/zig/*.vim \
 		runtime/colors/*.vim \
 		runtime/colors/README.txt \
 		runtime/colors/lists/*.vim \
@@ -815,6 +803,13 @@ RT_SCRIPTS =	\
 		runtime/plugin/README.txt \
 		runtime/syntax/*.vim \
 		runtime/syntax/README.txt \
+		runtime/syntax/shared/*.vim \
+		runtime/syntax/shared/README.txt \
+		runtime/syntax/Makefile \
+		runtime/syntax/testdir/README.txt \
+		runtime/syntax/testdir/runtest.vim \
+		runtime/syntax/testdir/input/*.* \
+		runtime/syntax/testdir/dumps/*.dump \

 # Unix runtime
 RT_UNIX =	\
@@ -942,11 +937,7 @@ EXTRA =		\
 		$(RT_EXTRA) \
 		$(SRC_EXTRA) \
 		README_extra.txt \
-		src/VisVim/VisVim.dll \
 		runtime/vimlogo.xpm \
-		src/tee/Makefile \
-		src/tee/Make_mvc.mak \
-		src/tee/tee.c \

 # files in READMEdir that are included from the top dir
 IN_README_DIR = \
@@ -1017,6 +1008,8 @@ LANG_GEN = \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
+		runtime/spell/sr/README_sr.txt \
+		runtime/spell/sr/convert.vim \
 		runtime/spell/tet/*.diff \
 		runtime/spell/tet/main.aap \
 		runtime/spell/check/main.aap \
--- a/35
+++ b/35
@@ -39,14 +39,15 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
-	@# When the target is "test" also run the indent tests.
+	@# When the target is "test" also run the indent and syntax tests.
 	@if test "$@" = "test"; then \
 		$(MAKE) indenttest; \
+		$(MAKE) syntaxtest; \
 	fi
-	@# When the target is "clean" also clean for the indent tests.
+	@# When the target is "clean" also clean for the indent and syntax tests.
 	@if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
-		cd runtime/indent && \
-			$(MAKE) clean; \
+		(cd runtime/indent && $(MAKE) clean); \
+		(cd runtime/syntax && $(MAKE) clean); \
 	fi

 # Executable used for running the indent tests.
@@ -57,6 +58,14 @@ indenttest:
 		$(MAKE) clean && \
 		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"

+# Executable used for running the syntax tests.
+VIM_FOR_SYNTAXTEST = ../../src/vim
+
+syntaxtest:
+	cd runtime/syntax && \
+		$(MAKE) clean && \
+		$(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"
+

 #########################################################################
 # 2. Creating the various distribution files.
@@ -84,8 +93,8 @@ indenttest:
 #    To do all this you need the Unix archive and compiled binaries.
 #    Before creating an archive first delete all backup files, *.orig, etc.

-MAJOR = 8
-MINOR = 2
+MAJOR = 9
+MINOR = 0

 # CHECKLIST for creating a new version:
 #
@@ -110,7 +119,7 @@ MINOR = 2
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
-# - Add remarks for changes to runtime/doc/version8.txt.
+# - Add remarks for changes to runtime/doc/version9.txt.
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
@@ -144,7 +153,7 @@ MINOR = 2
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim82 and puts all files in there.
+#   This creates the directory vim/vim90 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
@@ -198,11 +207,9 @@ MINOR = 2
 # - copy these files (get them from a binary archive or build them):
 #	gvimext.dll in src/GvimExt
 #	gvimext64.dll in src/GvimExt
-#	VisVim.dll in src/VisVim
-#   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_8.2.*_x64.zip as vim/vim82/GvimExt/gvimext64.dll.
+#	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
 #   version).  Also put winpty32.dll and winpty-agent.exe there.
 # - go to ../nsis and do:
@@ -414,6 +421,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
 	tar cf - \
 		$(SRC_ALL) \
 		$(SRC_DOS) \
+		$(SRC_DOS_BIN) \
 		$(SRC_AMI_DOS) \
 		$(SRC_DOS_UNIX) \
 		runtime/doc/uganda.nsis.txt \
@@ -423,9 +431,6 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 	# This file needs to be in dos fileformat for NSIS.
 	$(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt
-	tar cf - \
-		$(SRC_DOS_BIN) \
-		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)

 runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
@@ -556,8 +561,6 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
 	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
 	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cp README_ole.txt dist/vim/$(VIMRTDIR)
-	cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
-	cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR)
 	cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE)
 	cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb

--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)

-[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Travis Build Status](https://travis-ci.com/vim/vim.svg?branch=master)](https://travis-ci.com/github/vim/vim) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
+[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)

 <sub>For translations of this README see the end.</sub>

@@ -28,10 +28,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.

-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, Haiku, VMS and almost
-all flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
+flavours of UNIX.  Porting to other systems should not be very difficult.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.

 For Vim9 script see [README_VIM9](README_VIM9.md).

@@ -101,7 +101,7 @@ for details (do `:help uganda` inside Vim).

 Summary of the license: There are no restrictions on using or distributing an
 unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
-text must always be included.  For modified versions a few restrictions apply.
+text must always be included.  For modified versions, a few restrictions apply.
 The license is GPL compatible, you may compile Vim with GPL libraries and
 distribute it.

@@ -122,12 +122,14 @@ For the most recent information about sponsoring look on the Vim web site:

 ## Contributing ##

-If you would like to help making Vim better, see the
+If you would like to help make Vim better, see the
 [CONTRIBUTING.md](/CONTRIBUTING.md) file.


 ## Information ##

+If you are on macOS, you can use [Macvim](https://macvim-dev.github.io/macvim/).
+
 The latest news about Vim can be found on the Vim home page:
 	https://www.vim.org/

@@ -149,9 +151,4 @@ Send any other comments, patches, flowers and suggestions to:
 	Bram Moolenaar <Bram@vim.org>


-This is `README.md` for version 8.2 of Vim: Vi IMproved.
-
-
-## Translations of this README ##
-
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)
+This is `README.md` for version 9.0 of Vim: Vi IMproved.
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 8.2 of Vim: Vi IMproved.
+README.txt for version 9.0 of Vim: Vi IMproved.


 WHAT IS VIM?
@@ -16,10 +16,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.

-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
 flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.


 DISTRIBUTION
@@ -84,7 +84,7 @@ encouraged to make a donation to help orphans in Uganda.  Please read the file

 Summary of the license: There are no restrictions on using or distributing an
 unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
-text must always be included.  For modified versions a few restrictions apply.
+text must always be included.  For modified versions, a few restrictions apply.
 The license is GPL compatible, you may compile Vim with GPL libraries and
 distribute it.

@@ -106,7 +106,7 @@ For the most recent information about sponsoring look on the Vim web site:

 CONTRIBUTING

-If you would like to help making Vim better, see the CONTRIBUTING.md file.
+If you would like to help make Vim better, see the CONTRIBUTING.md file.


 INFORMATION
--- a/README_VIM9.md
+++ b/README_VIM9.md
@@ -2,18 +2,17 @@

 # What is Vim9?

-This is an experimental side of [Vim](https://github.com/vim/vim).
-It explores ways of making Vim script faster and better.
+This is a new syntax for Vim script that was introduced with Vim 9.0.
+It intends making Vim script faster and better.

-WARNING: The Vim9 script features are still under development, anything can
-break!

 # Why Vim9?

 ## 1. FASTER VIM SCRIPT

 The third item on the poll results of 2018, after popup windows and text
-properties, is faster Vim script.  So how do we do that?
+properties, both of which have been implemented, is faster Vim script.
+So how do we do that?

 I have been throwing some ideas around, and soon came to the conclusion
 that the current way functions are called and executed, with
@@ -53,7 +52,7 @@ we can gain, and also that Vim script can be faster than builtin
 interfaces.

 LuaJit is much faster at Lua-only instructions.  In practice the script would
-not do something useless as counting but change the text.  For example,
+not do something useless counting, but change the text.  For example,
 reindent all the lines:

 ``` vim
--- a/READMEdir/Contents
+++ b/READMEdir/Contents
@@ -9,15 +9,15 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 8.2.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim82rt.tgz  contains the documentation and syntax files.
-		vim82bin.tgz contains the binaries.
-		vim82src.tgz contains the sources.
+		Version 9.0.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim90rt.tgz  contains the documentation and syntax files.
+		vim90bin.tgz contains the binaries.
+		vim90src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


 Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
 		them and write them back.  Can also be used to patch files.

-		Version 1.10 (1997 May 22)
+		Version 2022 Jan 14
 		Author: Juergen Weigert
--- a/READMEdir/README_ami.txt
+++ b/READMEdir/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 8.2 of Vim: Vi IMproved.
+README_ami.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:

  cd dh0:editors
-  tar xf t:vim82bin.tar
-  tar xf t:vim82rt.tar
+  tar xf t:vim90bin.tar
+  tar xf t:vim90rt.tar

 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:
--- a/READMEdir/README_amibin.txt
+++ b/READMEdir/README_amibin.txt
@@ -1,8 +1,8 @@
-README_amibin.txt for version 8.2 of Vim: Vi IMproved.
+README_amibin.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim90rt.tgz).


 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
--- a/READMEdir/README_amisrc.txt
+++ b/READMEdir/README_amisrc.txt
@@ -1,8 +1,8 @@
-README_amisrc.txt for version 8.2 of Vim: Vi IMproved.
+README_amisrc.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim90rt.tgz).


 The Amiga source archive contains the files needed to compile Vim on the
--- a/READMEdir/README_bindos.txt
+++ b/READMEdir/README_bindos.txt
@@ -1,16 +1,16 @@
-README_bindos.txt for version 8.2 of Vim: Vi IMproved.
+README_bindos.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+These files are in the runtime archive (vim90rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim82w32.zip	Windows 95/98/NT/etc. console version
-	gvim82.zip	Windows 95/98/NT/etc. GUI version
-	gvim82ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim90w32.zip	Windows 95/98/NT/etc. console version
+	gvim90.zip	Windows 95/98/NT/etc. GUI version
+	gvim90ole.zip	Windows 95/98/NT/etc. GUI version with OLE

-You MUST also get the runtime archive (vim82rt.zip).
-The sources are also available (vim82src.zip).
+You MUST also get the runtime archive (vim90rt.zip).
+The sources are also available (vim90src.zip).
--- a/READMEdir/README_dos.txt
+++ b/READMEdir/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 8.2 of Vim: Vi IMproved.
+README_dos.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
   located.  Check the $VIM setting to see where it points to:
 	set VIM
   For example, if you have
-	C:\vim\vim82
+	C:\vim\vim90
   do
 	cd C:\
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim82",
+2. Unpack the zip archives.  This will create a new directory "vim\vim90",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim82.zip
-	unzip vim82w32.zip
+	pkunzip -d gvim90.zip
+	unzip vim90w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -65,7 +65,7 @@ These are the normal steps to install Vim from the .zip archives:
   won't move or copy the runtime files.

 3. Change to the new directory:
-	cd vim\vim82
+	cd vim\vim90
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -76,8 +76,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim82
-	set path=%path%;D:\editors\vim\vim82
+	set path=%path%;C:\vim\vim90
+	set path=%path%;D:\editors\vim\vim90
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -89,8 +89,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 8.2 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim82.  See ":help $VIM" for more information.
+  Vim version 9.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim90.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -101,14 +101,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim82\vim.exe		The Vim version 8.2 executable.
-	C:\vim\vim82\doc\*.txt		The version 8.2 documentation files.
-	C:\vim\vim82\bugreport.vim	A Vim version 8.2 script.
-	C:\vim\vim82\...		Other version 8.2 distributed files.
+	C:\vim\vim90\vim.exe		The Vim version 9.0 executable.
+	C:\vim\vim90\doc\*.txt		The version 9.0 documentation files.
+	C:\vim\vim90\bugreport.vim	A Vim version 9.0 script.
+	C:\vim\vim90\...		Other version 9.0 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim82".  Don't add
-  "vim82" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim90".  Don't add
+  "vim90" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -132,8 +132,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim82\vim.exe
-	C:\command.com /c D:\editors\vim\vim82\vim.exe
+	C:\command.com /c C:\vim\vim90\vim.exe
+	C:\command.com /c D:\editors\vim\vim90\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
--- a/READMEdir/README_extra.txt
+++ b/READMEdir/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 8.2 of Vim: Vi IMproved.
+README_extra.txt for version 9.0 of Vim: Vi IMproved.

 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
@@ -29,9 +29,6 @@ src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.

 src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.

-src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
-			Studio.
-
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry

 nsis/*			NSIS script to build the self-installing MS-Windows exe
--- a/READMEdir/README_haiku.txt
+++ b/READMEdir/README_haiku.txt
@@ -1,4 +1,4 @@
-README_haiku.txt for version 8.2 of Vim: Vi IMproved.
+README_haiku.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Haiku operating system.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_mac.txt
+++ b/READMEdir/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 8.2 of Vim: Vi IMproved.
+README_mac.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on MacOS systems.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_ole.txt
+++ b/READMEdir/README_ole.txt
@@ -1,6 +1,6 @@
-README_ole.txt for version 8.2 of Vim: Vi IMproved.
+README_ole.txt for version 9.0 of Vim: Vi IMproved.

-This archive contains gvim.exe with OLE interface and VisVim.
+This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
 It is only for MS-Windows 95/98/ME/NT/2000/XP.
@@ -15,6 +15,3 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"

 For further information, type this inside Vim:
 	:help if_ole
-
-Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
-the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.
--- a/READMEdir/README_os2.txt
+++ b/READMEdir/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 8.2 of Vim: Vi IMproved.
+README_os2.txt for version 9.0 of Vim: Vi IMproved.

 This file used to explain the installation of Vim on OS/2 systems.
 However, support for OS/2 has been removed in patch 7.4.1008.
--- a/READMEdir/README_os390.txt
+++ b/READMEdir/README_os390.txt
@@ -1,4 +1,4 @@
-README_os390.txt for version 8.2 of Vim: Vi IMproved.
+README_os390.txt for version 9.0 of Vim: Vi IMproved.

 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_src.txt
+++ b/READMEdir/README_src.txt
@@ -1,8 +1,8 @@
-README_src.txt for version 8.2 of Vim: Vi IMproved.
+README_src.txt for version 9.0 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-8.2-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-9.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
--- a/READMEdir/README_srcdos.txt
+++ b/READMEdir/README_srcdos.txt
@@ -1,12 +1,11 @@
-README_srcdos.txt for version 8.2 of Vim: Vi IMproved.
+README_srcdos.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+These files are in the runtime archive (vim90rt.zip).


 The DOS source archive contains the files needed to compile Vim on MS-Windows.
-It is packed for MS-Windows systems, with CR-LF.  It also includes the VisVim
-sources.
+It is packed for MS-Windows systems, with CR-LF.

 See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.
--- a/READMEdir/README_unix.txt
+++ b/READMEdir/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 8.2 of Vim: Vi IMproved.
+README_unix.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_vms.txt
+++ b/READMEdir/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 8.2 of Vim: Vi IMproved.
+README_vms.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
--- a/READMEdir/README_w32s.txt
+++ b/READMEdir/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 8.2 of Vim: Vi IMproved.
+README_w32s.txt for version 9.0 of Vim: Vi IMproved.

 This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11
 systems.  However, support for MS-Windows 3.1 and 3.11 has been removed in
--- a/ci/appveyor.bat
+++ b/ci/appveyor.bat
@@ -1,9 +1,54 @@
@echo off
 :: Batch file for building/testing Vim on AppVeyor
+set target=%1

 setlocal ENABLEDELAYEDEXPANSION
 cd %APPVEYOR_BUILD_FOLDER%

+:: Python3
+set PYTHON3_VER=311
+set PYTHON3_RELEASE=3.11.1
+set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
+set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
+
+set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+
+if exist "%VSWHERE%" (
+  for /f "usebackq delims=" %%i in (
+    `"%VSWHERE%" -products * -latest -property installationPath`
+  ) do (
+    set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  )
+)
+
+if not exist "%VCVARSALL%" (
+  set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+)
+call "%VCVARSALL%" x64
+
+goto %target%
+echo Unknown build target.
+exit 1
+
+:: ----------------------------------------------------------------------------
+:install
+@echo on
+if not exist downloads mkdir downloads
+
+:: Python 3
+if not exist %PYTHON3_DIR% (
+  call :downloadfile %PYTHON3_URL% downloads\python3.exe
+  cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% ^
+      Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 ^
+      AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 ^
+      InstallLauncherAllUsers=0
+)
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:build
+
 cd src

 echo "Building MSVC 64bit console Version"
@@ -22,7 +67,7 @@ if "%FEATURE%" == "HUGE" (
    nmake -f Make_mvc.mak CPU=AMD64 ^
        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
        PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
-        PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
+        PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
        FEATURES=%FEATURE%
 ) ELSE (
    nmake -f Make_mvc.mak CPU=AMD64 ^
@@ -39,4 +84,31 @@ echo "version output MSVC console"
 .\vim --version || exit 1
 echo "version output MSVC GUI"
 type ver_msvc.txt || exit 1
-cd ..
+
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:test
+@echo on
+cd src/testdir
+:: Testing with MSVC gvim
+path %PYTHON3_DIR%;%PATH%
+nmake -f Make_mvc.mak VIMPROG=..\gvim
+nmake -f Make_mvc.mak clean
+:: Testing with MSVC console version
+nmake -f Make_mvc.mak VIMPROG=..\vim
+
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:downloadfile
+:: call :downloadfile <URL> <localfile>
+if not exist %2 (
+	curl -f -L %1 -o %2
+)
+if ERRORLEVEL 1 (
+	rem Retry once.
+	curl -f -L %1 -o %2 || exit 1
+)
+@goto :eof
--- a/ci/build-snd-dummy.sh
+++ b/ci/build-snd-dummy.sh
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -eu
-
-LINUX_VERSION=$(uname -r | cut -d. -f1-2)
-LINUX_ARCHIVE_FILE=v${LINUX_VERSION}.tar.gz
-LINUX_SOURCE_DIR=linux-${LINUX_VERSION}
-
-mkdir -p "${TMPDIR}"
-cd "${TMPDIR}"
-
-wget -q "https://github.com/torvalds/linux/archive/${LINUX_ARCHIVE_FILE}"
-
-tar -xf "${LINUX_ARCHIVE_FILE}" "${LINUX_SOURCE_DIR}/sound"
-cd "${LINUX_SOURCE_DIR}/sound"
-
-CC=gcc make -C "/lib/modules/$(uname -r)/build" M="${PWD}" CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_PCM=m CONFIG_SND_DUMMY=m modules
-
-mkdir -p "${SND_DUMMY_DIR}"
-cp soundcore.ko core/snd.ko core/snd-pcm.ko drivers/snd-dummy.ko "${SND_DUMMY_DIR}"
--- a/ci/load-snd-dummy.sh
+++ b/ci/load-snd-dummy.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! modprobe snd-dummy; then
-    # snd-dummy is contained in linux-modules-extra (if exists)
-    apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
-    modprobe snd-dummy
-fi
--- a/nsis/README.txt
+++ b/nsis/README.txt
@@ -27,23 +27,20 @@ To build the installable .exe:
 	64-bit: src/GvimExt/gvimext64.dll
 	32-bit: src/GvimExt/gvimext.dll

-4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
-    archive).
-
-5.  Get a "diff.exe" program.  If you skip this the built-in diff will always
+4.  Get a "diff.exe" program.  If you skip this the built-in diff will always
    be used (which is fine for most users).  If you do have your own
-    "diff.exe" put it in the "../.." directory (above the "vim82" directory,
+    "diff.exe" put it in the "../.." directory (above the "vim90" directory,
    it's the same for all Vim versions).
    You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz

-6   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
+5   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim90"
    directory).  This is required for the terminal window.

-7.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
+6.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
    to do this on Unix.  Make sure the file is in DOS file format!

-8.  Get gettext and iconv DLLs from the following site:
+7.  Get gettext and iconv DLLs from the following site:
 	https://github.com/mlocati/gettext-iconv-windows/releases
    Both 64- and 32-bit versions are needed.
    Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -36,9 +36,6 @@ Unicode true
 # Comment the next line if you do not want to add Native Language Support
 !define HAVE_NLS

-# Uncomment the next line if you want to include VisVim extension:
-#!define HAVE_VIS_VIM
-
 # Comment the following line to create an English-only installer:
 !define HAVE_MULTI_LANG

@@ -55,9 +52,6 @@ Unicode true
 # ----------- No configurable settings below this line -----------

 !include "Library.nsh"		# For DLL install
-!ifdef HAVE_VIS_VIM
-  !include "UpgradeDLL.nsh"	# for VisVim.dll
-!endif
 !include "LogicLib.nsh"
 !include "MUI2.nsh"
 !include "nsDialogs.nsh"
@@ -234,6 +228,28 @@ FunctionEnd
 !insertmacro GetParent ""
 !insertmacro GetParent "un."

+# Get home directory
+!macro GetHomeDir un
+Function ${un}GetHomeDir
+  Push $0
+  Push $1
+  ReadEnvStr $0 "HOME"
+  ${If} $0 == ""
+    ReadEnvStr $0 "HOMEDRIVE"
+    ReadEnvStr $1 "HOMEPATH"
+    StrCpy $0 "$0$1"
+    ${If} $0 == ""
+      ReadEnvStr $0 "USERPROFILE"
+    ${EndIf}
+  ${EndIf}
+  Pop $1
+  Exch $0  # put $0 on top of stack, restore $0 to original value
+FunctionEnd
+!macroend
+
+!insertmacro GetHomeDir ""
+!insertmacro GetHomeDir "un."
+
 # Check if Vim is already installed.
 # return: Installed directory. If not found, it will be empty.
 Function CheckOldVim
@@ -366,11 +382,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMTOOLS}\winpty-agent.exe

 	SetOutPath $0\colors
-	File ${VIMRT}\colors\*.*
-	SetOutPath $0\colors\tools
-	File ${VIMRT}\colors\tools\*.*
-	SetOutPath $0\colors\lists
-	File ${VIMRT}\colors\lists\*.*
+	File /r ${VIMRT}\colors\*.*

 	SetOutPath $0\compiler
 	File ${VIMRT}\compiler\*.*
@@ -395,13 +407,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMRT}\plugin\*.*

 	SetOutPath $0\autoload
-	File ${VIMRT}\autoload\*.*
-
-	SetOutPath $0\autoload\dist
-	File ${VIMRT}\autoload\dist\*.*
-
-	SetOutPath $0\autoload\xml
-	File ${VIMRT}\autoload\xml\*.*
+	File /r ${VIMRT}\autoload\*.*

 	SetOutPath $0\import\dist
 	File ${VIMRT}\import\dist\*.*
@@ -410,7 +416,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMSRC}\vim.ico

 	SetOutPath $0\syntax
-	File ${VIMRT}\syntax\*.*
+	File /r ${VIMRT}\syntax\*.*

 	SetOutPath $0\spell
 	File ${VIMRT}\spell\*.txt
@@ -536,7 +542,8 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	Section "$(str_section_plugin_home)" id_section_pluginhome
 		SectionIn 1 3

-		StrCpy $1 "$1 -create-directories home"
+		# use ShellExecAsUser below instead
+		# StrCpy $1 "$1 -create-directories home"
 	SectionEnd

 	Section "$(str_section_plugin_vim)" id_section_pluginvim
@@ -546,17 +553,6 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	SectionEnd
 SectionGroupEnd

-##########################################################
-!ifdef HAVE_VIS_VIM
-Section "$(str_section_vis_vim)" id_section_visvim
-	SectionIn 3
-
-	SetOutPath $0
-	!insertmacro UpgradeDLL "${VIMSRC}\VisVim\VisVim.dll" "$0\VisVim.dll" "$0"
-	File ${VIMSRC}\VisVim\README_VisVim.txt
-SectionEnd
-!endif
-
 ##########################################################
 !ifdef HAVE_NLS
 Section "$(str_section_nls)" id_section_nls
@@ -621,6 +617,13 @@ Section -call_install_exe
 	DetailPrint "$(str_msg_registering)"
 	nsExec::Exec "$0\install.exe $1"
 	Pop $3
+
+	${If} ${SectionIsSelected} ${id_section_pluginhome}
+	  ReadEnvStr $3 "COMSPEC"
+	  Call GetHomeDir
+	  Pop $4
+	  ShellExecAsUser::ShellExecAsUser "" "$3" '/c "cd /d "$4" & mkdir vimfiles & cd vimfiles & mkdir colors compiler doc ftdetect ftplugin indent keymap plugin syntax"' SW_HIDE
+	${EndIf}
 SectionEnd

 ##########################################################
@@ -644,12 +647,6 @@ Section -post
 	  SectionGetSize ${id_section_editwith} $4
 	  IntOp $3 $3 + $4
 	${EndIf}
-!ifdef HAVE_VIS_VIM
-	${If} ${SectionIsSelected} ${id_section_visvim}
-	  SectionGetSize ${id_section_visvim} $4
-	  IntOp $3 $3 + $4
-	${EndIf}
-!endif
 !ifdef HAVE_NLS
 	${If} ${SectionIsSelected} ${id_section_nls}
 	  SectionGetSize ${id_section_nls} $4
@@ -680,9 +677,6 @@ Section -post
 	!insertmacro SaveSectionSelection ${id_section_vimrc}      "select_vimrc"
 	!insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome"
 	!insertmacro SaveSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-	!insertmacro SaveSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
 	!insertmacro SaveSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -754,9 +748,6 @@ Function .onInit
  !insertmacro LoadSectionSelection ${id_section_vimrc}      "select_vimrc"
  !insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome"
  !insertmacro LoadSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-  !insertmacro LoadSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
  !insertmacro LoadSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -931,9 +922,6 @@ FunctionEnd
    !insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin}        $(str_desc_plugin)
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome}  $(str_desc_plugin_home)
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim}   $(str_desc_plugin_vim)
-!ifdef HAVE_VIS_VIM
-    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_visvim}      $(str_desc_vis_vim)
-!endif
 !ifdef HAVE_NLS
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls}         $(str_desc_nls)
 !endif
@@ -957,13 +945,6 @@ Section "un.$(str_unsection_register)" id_unsection_register
 	# created.  Thus the "vim61" directory is included in it.
 	StrCpy $0 "$INSTDIR"

-!ifdef HAVE_VIS_VIM
-	# If VisVim was installed, unregister the DLL.
-	${If} ${FileExists} "$0\VisVim.dll"
-	  ExecWait "regsvr32.exe /u /s $0\VisVim.dll"
-	${EndIf}
-!endif
-
 	# delete the context menu entry and batch files
 	DetailPrint "$(str_msg_unregistering)"
 	nsExec::Exec "$0\uninstall.exe -nsis"
@@ -1056,9 +1037,6 @@ Section "un.$(str_unsection_exe)" id_unsection_exe
 	RMDir /r $0\syntax
 	RMDir /r $0\tools
 	RMDir /r $0\tutor
-!ifdef HAVE_VIS_VIM
-	RMDir /r $0\VisVim
-!endif
 	RMDir /r $0\lang
 	RMDir /r $0\keymap
 	Delete $0\*.exe
@@ -1094,15 +1072,8 @@ SectionEnd
 SectionGroup "un.$(str_ungroup_plugin)" id_ungroup_plugin
 	Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home
 		# get the home dir
-		ReadEnvStr $0 "HOME"
-		${If} $0 == ""
-		  ReadEnvStr $0 "HOMEDRIVE"
-		  ReadEnvStr $1 "HOMEPATH"
-		  StrCpy $0 "$0$1"
-		  ${If} $0 == ""
-		    ReadEnvStr $0 "USERPROFILE"
-		  ${EndIf}
-		${EndIf}
+		Call un.GetHomeDir
+		Pop $0

 		${If} $0 != ""
 		  !insertmacro RemoveVimfiles $0
--- a/nsis/gvim_version.nsh
+++ b/nsis/gvim_version.nsh
@@ -1,6 +1,6 @@
 # Generated from Makefile: define the version numbers
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
-!define VER_MAJOR 8
-!define VER_MINOR 2
+!define VER_MAJOR 9
+!define VER_MINOR 0
 !endif
--- a/nsis/lang/danish.nsi
+++ b/nsis/lang/danish.nsi
@@ -79,9 +79,6 @@ LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HO
 LangString str_section_plugin_vim   ${LANG_DANISH}     "Delte"
 LangString str_desc_plugin_vim      ${LANG_DANISH}     "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."

-LangString str_section_vis_vim      ${LANG_DANISH}     "VisVim-udvidelser"
-LangString str_desc_vis_vim         ${LANG_DANISH}     "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
 LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."

--- a/nsis/lang/dutch.nsi
+++ b/nsis/lang/dutch.nsi
@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim      ${LANG_DUTCH} \
    "Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
     voor iedereen op het systeem."

-LangString str_section_vis_vim      ${LANG_DUTCH} \
-    "VisVim extensie"
-LangString str_desc_vis_vim         ${LANG_DUTCH} \
-    "VisVim extensie voor Microsoft Visual Studio integratie."
-
 LangString str_section_nls          ${LANG_DUTCH} \
    "Ondersteuning voor andere talen"
 LangString str_desc_nls             ${LANG_DUTCH} \
--- a/nsis/lang/english.nsi
+++ b/nsis/lang/english.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_ENGLISH} \
    "Create plugin directories in Vim install directory, it is used for \
     everybody on the system."

-LangString str_section_vis_vim      ${LANG_ENGLISH} \
-    "VisVim Extension"
-LangString str_desc_vis_vim         ${LANG_ENGLISH} \
-    "VisVim Extension for Microsoft Visual Studio integration."
-
 LangString str_section_nls          ${LANG_ENGLISH} \
    "Native Language Support"
 LangString str_desc_nls             ${LANG_ENGLISH} \
--- a/nsis/lang/german.nsi
+++ b/nsis/lang/german.nsi
@@ -122,11 +122,6 @@ LangString str_desc_plugin_vim      ${LANG_GERMAN} \
    "Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
     für alle Benutzer dieses Systems genutzt."

-LangString str_section_vis_vim      ${LANG_GERMAN} \
-    "VisVim-Erweiterung"
-LangString str_desc_vis_vim         ${LANG_GERMAN} \
-    "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_GERMAN} \
    "Unterstützung für andere Sprachen"
 LangString str_desc_nls             ${LANG_GERMAN} \
--- a/nsis/lang/italian.nsi
+++ b/nsis/lang/italian.nsi
@@ -3,9 +3,8 @@
 # italian.nsi : Italian language strings for gvim NSIS installer.
 #
 # Locale ID    : 1040
-# Locale Name  : it
 # fileencoding : UTF-8
-# Author       : Antonio Colombo
+# Author       : Antonio Colombo, bovirus - revision: 12.05.2023

 !insertmacro MUI_LANGUAGE "Italian"

@@ -22,10 +21,10 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 ##############################################################################

 #LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"
+#    "Cartella installazione (il percorso deve finire con $\"vim$\")"

 LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza README al termine dell'installazione"
+    "Visualizza file README a fine installazione"

 # Install types:
 LangString str_type_typical         ${LANG_ITALIAN} \
@@ -43,125 +42,119 @@ LangString str_type_full            ${LANG_ITALIAN} \
 ##############################################################################

 LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i"
+    "Disinstalla versioni esistenti"
 LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."
+    "Disinstalla versioni esistenti di Vim."

 LangString str_section_exe          ${LANG_ITALIAN} \
-    "Vim GUI e file di supporto"
+    "GUI e file supporto Vim"
 LangString str_desc_exe             ${LANG_ITALIAN} \
-    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."
+    "GUI programmi e file di supporto Vim.  Questa componente è indispensabile."

 LangString str_section_console      ${LANG_ITALIAN} \
-    "Vim console (vim.exe per MS-DOS)"
+    "Console Vim (vim.exe per MS-DOS)"
 LangString str_desc_console         ${LANG_ITALIAN} \
    "Versione console di Vim (vim.exe)."

 LangString str_section_batch        ${LANG_ITALIAN} \
    "Crea file .bat"
 LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file .bat per varianti di Vim nella directory \
+    "Crea file .bat per varianti di Vim nella cartella \
     di Windows, per utilizzo da riga di comando."

 LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone per Vim"
+    "Crea icone Vim"
 LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone per Vim in vari posti, per rendere facile l'accesso."
+    "Crea icone Vim per rendere facile l'accesso."

 LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Sul Desktop"
+    "Icone sul Desktop"
 LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone per programma gVim sul desktop."
+    "Crea icone programma gVim sul desktop."

 LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Nella cartella del menù START"
+    "Gruppo programmi menù START"
 LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiungi Vim alle cartelle del menù START."
+    "Aggiunge gruppo programmi al menù START."

 #LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Nella barra di Avvio Veloce"
+#    "Barra avvio veloce"
 #LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."
+#    "Aggiunge un collegamento a Vim nella barra di avvio veloce."

 LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al Menù Contestuale"
+    "Aggiungi Vim al menù contestuale"
 LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."
+    "Aggiunge Vim al menu contestuale $\"Apri con...$\"."

 #LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32-bit"
+#    "Versione a 32 bit"
 #LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 32-bit."
+#    "Aggiungi Vim al menu contestuale $\"Apri con...$\" \
+#     per applicazioni a 32 bit."

 #LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64-bit"
+#    "Versione a 64 bit"
 #LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 64-bit."
+#    "Aggiunge Vim al menu contestuale $\"Apri con...$\" \
+#     per applicazioni a 64 bit."

 LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione di default"
+    "Crea configurazione predefinita"
 LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea un file configurazione di default (_vimrc) se non \
-     ne esiste già uno."
+    "Crea, se non ne esiste già uno, un file configurazione predefinito (_vimrc) ."

 LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea directory per plugin"
+    "Crea cartella plugin"
 LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
-     a Vim mettendo file in una di queste directory."
+    "Crea cartella plugin.  I plugin consentono di aggiungere funzionalità \
+     a Vim copiando i relativi file in una di queste cartelle."

 LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Private"
+    "Privata"
 LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory HOME."
+    "Crea cartella plugin nella cartella HOME."

 LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivise"
+    "Condivisa"
 LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory di installazione di Vim \
+    "Crea cartella plugin nella cartella di installazione di Vim \
     per uso da parte di tutti gli utenti di questo sistema."

-LangString str_section_vis_vim      ${LANG_ITALIAN} \
-    "Estensione VisVim"
-LangString str_desc_vis_vim         ${LANG_ITALIAN} \
-    "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto Multilingue (NLS)"
+    "Supporto nativo lingua (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa file per supportare messaggi in diverse lingue."
+    "Installa i file per il supporto nativo multilingua."

 LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Togli Vim dal Registry"
+    "Rimuovi Vim dal registro"
 LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Togli Vim dal Registry di configurazione sistema."
+    "Rimuove Vim dal registro di configurazione sistema."

 LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Cancella programmi/file di supporto Vim"
+    "Elimina programmi/file di supporto Vim"
 LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Cancella tutti i programmi/file di supporto di Vim."
+    "Elimina tutti i programmi/file di supporto di Vim."

 LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin"
+    "Elimina cartelle plugin"
 LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin se sono vuote."
+    "Elimina le cartelle plugin se sono vuote."

 LangString str_unsection_plugin_home ${LANG_ITALIAN} \
    "Private"
 LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory HOME."
+    "Elimina cartelle plugin nella cartella HOME."

 LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
    "Condivise"
 LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory di installazione di Vim."
+    "Elimina cartelle plugin nella cartella di installazione di Vim."

 LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim"
+    "Elimina la cartella di installazione di Vim"
 LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"
+    "Elimina la cartella di installazione di Vim. Contiene i file di configurazione!"


 ##############################################################################
@@ -169,75 +162,74 @@ LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
 ##############################################################################

 #LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
+#    "Rilevate nel sistema $vim_old_ver_count versioni di Vim.$\r$\n\
 #     Questo programma di installazione può gestire solo \
 #     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstallate qualche versione precedente e ricominciate."
+#     Disinstalla qualche versione precedente e ricomincia."

 #LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
+#    "Nome cartella di installazione non valida: $vim_install_root!$\r$\n\
 #     Dovrebbe terminare con $\"vim$\"."

 #LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella directory di installazione!$\r$\n$\r$\n\
-#     Cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema segnala invece $\"$INSTDIR$\"."
+#    "Conflitto nella cartella di installazione!$\r$\n$\r$\n\
+#     La cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
+#     ma il sistema indica che il percorso è $\"$INSTDIR$\"."

 #LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
-#     Chiudete tutte le sessioni attive di Vim per continuare."
+#    "Vim è ancora in esecuzione nel sistema.$\r$\n\
+#     Per continuare chiudi tutte le sessioni attive di Vim."

 #LangString str_msg_register_ole  ${LANG_ITALIAN} \
 #    "Tentativo di registrazione di Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."

 #LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di togliere dal Registry Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#    "Tentativo di rimozione di VIM dal registro via OLE. \
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."

 #LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della seguente versione:"
+#    "Disinstallazione della versione:"

 #LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la seguente versione:"
+#    "Disinstallazione non riuscita per la versione:"

 #LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Non riesco a trovare chiave di disinstallazione nel Registry."
+#    "Impossibile trovare chiave disinstallazione nel registro."

 #LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione nel Registry."
+#    "Impossibile trovare programma disinstallazione nel registro."

 #LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione."
+#    "Impossibile trovare programma disinstallazione."

 #LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Non riesco a copiare programma disinstallazione a una \
-#     directory temporanea."
+#    "Impossibile copiare il programma disinstallazione in una cartella temporanea."

 #LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Non riesco a eseguire programma disinstallazione."
+#    "Impossibile eseguire programma disinstallazione."

 #LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."
+#    "Il programma di disinstallazione verrà chiuso senza aver eseguito nessuna modifica."

 LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita. Miglior fortuna alla prossima!"
+    "Installazione non riuscita."

 LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
-     Dovreste cancellarli voi stessi."
+    "Alcuni file in $0 non sono stati eliminati!$\r$\n\
+     I file vanno rimossi manualmente."

 #LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"
+#    "AVVISO: impossibile eliminare $\"$vim_install_root$\", non è vuota!"

 LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Sto disinstallando la vecchia versione..."
+    "Disinstallazione vecchia versione Vim..."

 LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Sto aggiungendo Vim al Registry..."
+    "Aggiunta di Vim al registro..."

 LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Sto togliendo Vim dal Registry..."
+    "Rimozione di Vim dal registro..."


 ##############################################################################
@@ -247,37 +239,37 @@ LangString str_msg_unregistering ${LANG_ITALIAN} \
 LangString str_vimrc_page_title    ${LANG_ITALIAN} \
    "Scelta impostazioni _vimrc"
 LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni per funzionalità ulteriori, tastiera e mouse."
+    "Scelta impostazioni funzionalità aggiuntive, tastiera e mouse."

 LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " comportamento come Vi / Vim "
+    " Comportamento come Vi / Vim "
 LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità ulteriori"
+    "&Compatibilità e funzionalità"
 LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile con Vi"
+    "Compatibile Vi"
 LangString str_msg_compat_vim      ${LANG_ITALIAN} \
    "Vim originale"
 LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
+    "Vim con alcune funzionalità aggiuntive (defaults.vim)"
 LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"
+    "Vim con tutte le funzionalità aggiuntive (vimrc_example.vim) (predefinito)"

 LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature "
+    " Mappature tastiera "
 LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
+    "&Rimappa alcuni tasti Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
 LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non effettuare rimappature di tasti (Default)"
+    "Non rimappare i tasti (predefinito)"
 LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappare solo alcuni tasti"
+    "Rimappa solo alcuni tasti"

 LangString str_msg_mouse_title   ${LANG_ITALIAN} \
    " Mouse "
 LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento dei pulsanti destro e sinistro"
+    "&Comportamento pulsanti destro/sinistro"
 LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: modalità visuale (Default)"
+    "Destro: menu popup, Sinistro: modalità visuale (predefinito)"
 LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
+    "Destro: menu popup, Sinistro: selezione modalità (Windows)"
 LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"
+    "Destro: estensione selezione, Sinistro: modalità visuale (Unix)"
--- a/nsis/lang/japanese.nsi
+++ b/nsis/lang/japanese.nsi
@@ -128,11 +128,6 @@ LangString str_section_plugin_vim   ${LANG_JAPANESE} \
 LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
    "プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"

-LangString str_section_vis_vim      ${LANG_JAPANESE} \
-    "VisVim 拡張"
-LangString str_desc_vis_vim         ${LANG_JAPANESE} \
-    "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
 LangString str_section_nls          ${LANG_JAPANESE} \
    "多言語サポート"
 LangString str_desc_nls             ${LANG_JAPANESE} \
--- a/nsis/lang/russian.nsi
+++ b/nsis/lang/russian.nsi
@@ -125,11 +125,6 @@ LangString str_desc_plugin_vim      ${LANG_RUSSIAN} \
     Модули в этом каталоге будут доступны для любого пользователя \
     зарегистрировавшегося в системе"

-LangString str_section_vis_vim      ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim"
-LangString str_desc_vis_vim         ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim используется для интеграции с Microsoft Visual Studio"
-
 LangString str_section_nls          ${LANG_RUSSIAN} \
    "Поддержка региональных языков"
 LangString str_desc_nls             ${LANG_RUSSIAN} \
--- a/nsis/lang/serbian.nsi
+++ b/nsis/lang/serbian.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
    "Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
     на систему."

-LangString str_section_vis_vim      ${LANG_SERBIAN} \
-    "VisVim проширење"
-LangString str_desc_vis_vim         ${LANG_SERBIAN} \
-    "VisVim проширење за Microsoft Visual Studio интеграцију."
-
 LangString str_section_nls          ${LANG_SERBIAN} \
    "Подршка за домаћи језик"
 LangString str_desc_nls             ${LANG_SERBIAN} \
--- a/nsis/lang/simpchinese.nsi
+++ b/nsis/lang/simpchinese.nsi
@@ -120,11 +120,6 @@ LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
    "在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
     该目录下的扩展插件。"

-LangString str_section_vis_vim      ${LANG_SIMPCHINESE} \
-    "VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_SIMPCHINESE} \
-    "安装与 Visual Studio 集成的 VisVim 插件。"
-
 LangString str_section_nls          ${LANG_SIMPCHINESE} \
    "安装多语言支持"
 LangString str_desc_nls             ${LANG_SIMPCHINESE} \
--- a/nsis/lang/tradchinese.nsi
+++ b/nsis/lang/tradchinese.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
    "在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
     在該資料夾里的擴展插件。"

-LangString str_section_vis_vim      ${LANG_TRADCHINESE} \
-    "安裝 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_TRADCHINESE} \
-    "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
 LangString str_section_nls          ${LANG_TRADCHINESE} \
    "安裝本地語言支持"
 LangString str_desc_nls             ${LANG_TRADCHINESE} \
--- a/nsis/lang/turkish.nsi
+++ b/nsis/lang/turkish.nsi
@@ -90,11 +90,6 @@ LangString str_desc_plugin_vim      ${LANG_TURKISH} \
    "Eklenti dizinlerini Vim yükleme dizininde oluşturur. Bu eklentilerden \
     bilgisayarın tüm kullanıcıları yararlanabilir."

-LangString str_section_vis_vim      ${LANG_TURKISH} \
-    "VisVim eklentisi"
-LangString str_desc_vis_vim         ${LANG_TURKISH} \
-    "Microsoft Visual Studio entegrasyonu için VisVim eklentisi"
-
 LangString str_section_nls          ${LANG_TURKISH} \
    "Ek dil desteği"
 LangString str_desc_nls             ${LANG_TURKISH} \
--- a/runtime/autoload/bitbake.vim
+++ b/runtime/autoload/bitbake.vim
@@ -0,0 +1,95 @@
+" Support for bitbake indenting, see runtime/indent/bitbake.vim
+
+function s:is_bb_python_func_def(lnum)
+    let stack = synstack(a:lnum, 1)
+    if len(stack) == 0
+        return 0
+    endif
+
+    return synIDattr(stack[0], "name") == "bbPyFuncDef"
+endfunction
+
+function bitbake#Indent(lnum)
+    if !has('syntax_items')
+        return -1
+    endif
+
+    let stack = synstack(a:lnum, 1)
+    if len(stack) == 0
+        return -1
+    endif
+
+    let name = synIDattr(stack[0], "name")
+
+    " TODO: support different styles of indentation for assignments. For now,
+    " we only support like this:
+    " VAR = " \
+    "     value1 \
+    "     value2 \
+    " "
+    "
+    " i.e. each value indented by shiftwidth(), with the final quote " completely unindented.
+    if name == "bbVarValue"
+        " Quote handling is tricky. kernel.bbclass has this line for instance:
+        "     EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" " HOSTCPP="${BUILD_CPP}""
+        " Instead of trying to handle crazy cases like that, just assume that a
+        " double-quote on a line by itself (following an assignment) means the
+        " user is closing the assignment, and de-dent.
+        if getline(a:lnum) =~ '^\s*"$'
+            return 0
+        endif
+
+        let prevstack = synstack(a:lnum - 1, 1)
+        if len(prevstack) == 0
+            return -1
+        endif
+
+        let prevname = synIDattr(prevstack[0], "name")
+
+        " Only indent if there was actually a continuation character on
+        " the previous line, to avoid misleading indentation.
+        let prevlinelastchar = synIDattr(synID(a:lnum - 1, col([a:lnum - 1, "$"]) - 1, 1), "name")
+        let prev_continued = prevlinelastchar == "bbContinue"
+
+        " Did the previous line introduce an assignment?
+        if index(["bbVarDef", "bbVarFlagDef"], prevname) != -1
+            if prev_continued
+                return shiftwidth()
+            endif
+        endif
+
+        if !prev_continued
+            return 0
+        endif
+
+        " Autoindent can take it from here
+        return -1
+    endif
+
+    if index(["bbPyDefRegion", "bbPyFuncRegion"], name) != -1
+        let ret = python#GetIndent(a:lnum, function('s:is_bb_python_func_def'))
+        " Should normally always be indented by at least one shiftwidth; but allow
+        " return of -1 (defer to autoindent) or -2 (force indent to 0)
+        if ret == 0
+            return shiftwidth()
+        elseif ret == -2
+            return 0
+        endif
+        return ret
+    endif
+
+    " TODO: GetShIndent doesn't detect tasks prepended with 'fakeroot'
+    " Need to submit a patch upstream to Vim to provide an extension point.
+    " Unlike the Python indenter, the Sh indenter is way too large to copy and
+    " modify here.
+    if name == "bbShFuncRegion"
+        return GetShIndent()
+    endif
+
+    " TODO:
+    "   + heuristics for de-denting out of a bbPyDefRegion? e.g. when the user
+    "       types an obvious BB keyword like addhandler or addtask, or starts
+    "       writing a shell task. Maybe too hard to implement...
+
+    return -1
+endfunction
--- a/runtime/autoload/context.vim
+++ b/runtime/autoload/context.vim
@@ -1,184 +1,100 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
+vim9script

-let s:keepcpo= &cpo
-set cpo&vim
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Sep 19

-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
+# Typesetting {{{
+import autoload './typeset.vim'

-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
+export def ConTeXtCmd(path: string): list<string>
+  var cmd = ['mtxrun', '--script', 'context', '--nonstopmode', '--autogenerate']
+  if !empty(get(g:, 'context_extra_options', ''))
+    cmd += g:context_extra_options
+  endif
+  cmd->add(path)
+  return cmd
+enddef

-" For backward compatibility
-if exists('*win_getid')
+export def Typeset(bufname: string, env = {}, Cmd = ConTeXtCmd): bool
+  return typeset.TypesetBuffer(bufname, Cmd, env, 'ConTeXt')
+enddef

-  function! s:win_getid()
-    return win_getid()
-  endf
+export def JobStatus()
+  typeset.JobStatus('ConTeXt')
+enddef

-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
+export def StopJobs()
+  typeset.StopJobs('ConTeXt')
+enddef

-else
+export def Log(bufname: string)
+  execute 'edit' typeset.LogPath(bufname)
+enddef
+# }}}

-  function! s:win_getid()
-    return winnr()
-  endf
+# Completion {{{
+def BinarySearch(base: string, keywords: list<string>): list<string>
+  const pat = '^' .. base
+  const len = len(keywords)
+  var res = []
+  var lft = 0
+  var rgt = len

-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+  # Find the leftmost index matching base
+  while lft < rgt
+    var i = (lft + rgt) / 2
+    if keywords[i] < base
+      lft = i + 1
    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+      rgt = i
    endif
-  endfunction
+  endwhile

-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
+  while lft < len && keywords[lft] =~ pat
+    add(res, keywords[lft])
+    lft += 1
+  endwhile
+
+  return res
+enddef
+
+var isMetaPostBlock = false
+
+var MP_KEYWORDS:  list<string> = []
+var CTX_KEYWORDS: list<string> = []
+
+# Complete only MetaPost keywords in MetaPost blocks, and complete only
+# ConTeXt keywords otherwise.
+export def Complete(findstart: number, base: string): any
+  if findstart == 1
+    if len(synstack(line("."), 1)) > 0 && synIDattr(synstack(line("."), 1)[0], "name") ==# 'contextMPGraphic'
+      isMetaPostBlock = true
+      return match(getline('.'), '\S\+\%' .. col('.') .. 'c')
    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction

-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
+    # Complete only \commands starting with a backslash
+    isMetaPostBlock = false
+    var pos = match(getline('.'), '\\\zs\S\+\%' .. col('.') .. 'c')
+    return (pos == -1) ? -3 : pos
  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
+
+  if isMetaPostBlock
+    if empty(MP_KEYWORDS)
+      MP_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList(['mf\w\+', 'mp\w\+']))
+    endif
+    return BinarySearch(base, MP_KEYWORDS)
  endif
-endfunction

-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
+  if empty(CTX_KEYWORDS)
+    CTX_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList([
+      'context\w\+', 'texAleph', 'texEtex', 'texLuatex', 'texOmega',
+      'texPdftex', 'texTex', 'texXeTeX'
+    ]))
+  endif
+  return BinarySearch(base, CTX_KEYWORDS)
+enddef
+# }}}

-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
+# vim: sw=2 fdm=marker
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Apr 13
+# Last Change:	2023 Jun 09

 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
@@ -72,22 +72,35 @@ export def FTbas()

  # most frequent FreeBASIC-specific keywords in distro files
  var fb_keywords = '\c^\s*\%(extern\|var\|enum\|private\|scope\|union\|byref\|operator\|constructor\|delete\|namespace\|public\|property\|with\|destructor\|using\)\>\%(\s*[:=(]\)\@!'
-  var fb_preproc  = '\c^\s*\%(#\a\+\|option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\)'
+  var fb_preproc  = '\c^\s*\%(' ..
+                      # preprocessor
+                      '#\s*\a\+\|' ..
+                      # compiler option
+                      'option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\|' ..
+                      # metacommand
+                      '\%(''\|rem\)\s*\$lang\>\|' ..
+                      # default datatype
+                      'def\%(byte\|longint\|short\|ubyte\|uint\|ulongint\|ushort\)\>' ..
+                    '\)'
  var fb_comment  = "^\\s*/'"
+
  # OPTION EXPLICIT, without the leading underscore, is common to many dialects
  var qb64_preproc = '\c^\s*\%($\a\+\|option\s\+\%(_explicit\|_\=explicitarray\)\>\)'

-  var lines = getline(1, min([line("$"), 100]))
-
-  if match(lines, fb_preproc) > -1 || match(lines, fb_comment) > -1 || match(lines, fb_keywords) > -1
-    setf freebasic
-  elseif match(lines, qb64_preproc) > -1
-    setf qb64
-  elseif match(lines, ft_visual_basic_content) > -1
-    setf vb
-  else
-    setf basic
-  endif
+  for lnum in range(1, min([line("$"), 100]))
+    var line = getline(lnum)
+    if line =~ ft_visual_basic_content
+      setf vb
+      return
+    elseif line =~ fb_preproc || line =~ fb_comment || line =~ fb_keywords
+      setf freebasic
+      return
+    elseif line =~ qb64_preproc
+      setf qb64
+      return
+    endif
+  endfor
+  setf basic
 enddef

 export def FTbtm()
@@ -126,6 +139,23 @@ export def FTcfg()
  endif
 enddef

+export def FTcls()
+  if exists("g:filetype_cls")
+    exe "setf " .. g:filetype_cls
+    return
+  endif
+
+  if getline(1) =~ '^\v%(\%|\\)'
+    setf tex
+  elseif getline(1)[0] == '#' && getline(1) =~ 'rexx'
+    setf rexx
+  elseif getline(1) == 'VERSION 1.0 CLASS'
+    setf vb
+  else
+    setf st
+  endif
+enddef
+
 export def FTlpc()
  if exists("g:lpc_syntax_for_c")
    var lnum = 1
@@ -277,14 +307,16 @@ export def FTfs()
  if exists("g:filetype_fs")
    exe "setf " .. g:filetype_fs
  else
-    var line = getline(nextnonblank(1))
-    # comments and colon definitions
-    if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
-	  \ || line =~ '^\s*: \S'
-      setf forth
-    else
-      setf fsharp
-    endif
+    var n = 1
+    while n < 100 && n <= line("$")
+      # Forth comments and colon definitions
+      if getline(n) =~ "^[:(\\\\] "
+        setf forth
+        return
+      endif
+      n += 1
+    endwhile
+    setf fsharp
  endif
 enddef

@@ -318,7 +350,7 @@ export def FTidl()
  setf idl
 enddef

-# Distinguish between "default" and Cproto prototype file. */
+# Distinguish between "default", Prolog and Cproto prototype file.
 export def ProtoCheck(default: string)
  # Cproto files have a comment in the first line and a function prototype in
  # the second line, it always ends in ";".  Indent files may also have
@@ -328,7 +360,14 @@ export def ProtoCheck(default: string)
  if getline(2) =~ '.;$'
    setf cpp
  else
-    exe 'setf ' .. default
+    # recognize Prolog by specific text in the first non-empty line
+    # require a blank after the '%' because Perl uses "%list" and "%translate"
+    var lnum = getline(nextnonblank(1))
+    if lnum =~ '\<prolog\>' || lnum =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || lnum =~ ':-'
+      setf prolog
+    else
+      exe 'setf ' .. default
+    endif
  endif
 enddef

@@ -429,30 +468,30 @@ export def FTmm()
  setf nroff
 enddef

-# Returns true if file content looks like LambdaProlog
+# Returns true if file content looks like LambdaProlog module
 def IsLProlog(): bool
-  # skip apparent comments and blank lines, what looks like 
+  # skip apparent comments and blank lines, what looks like
  # LambdaProlog comment may be RAPID header
-  var l: number = nextnonblank(1)
-  while l > 0 && l < line('$') && getline(l) =~ '^\s*%' # LambdaProlog comment
-    l = nextnonblank(l + 1)
+  var lnum: number = nextnonblank(1)
+  while lnum > 0 && lnum < line('$') && getline(lnum) =~ '^\s*%' # LambdaProlog comment
+    lnum = nextnonblank(lnum + 1)
  endwhile
  # this pattern must not catch a go.mod file
-  return getline(l) =~ '\<module\s\+\w\+\s*\.\s*\(%\|$\)'
+  return getline(lnum) =~ '\<module\s\+\w\+\s*\.\s*\(%\|$\)'
 enddef

 # Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod
 export def FTmod()
  if exists("g:filetype_mod")
    exe "setf " .. g:filetype_mod
+  elseif expand("<afile>") =~ '\<go.mod$'
+    setf gomod
  elseif IsLProlog()
    setf lprolog
  elseif getline(nextnonblank(1)) =~ '\%(\<MODULE\s\+\w\+\s*;\|^\s*(\*\)'
    setf modula2
  elseif IsRapid()
    setf rapid
-  elseif expand("<afile>") =~ '\<go.mod$'
-    setf gomod
  else
    # Nothing recognized, assume modsim3
    setf modsim3
@@ -465,8 +504,8 @@ export def FTpl()
  else
    # recognize Prolog by specific text in the first non-empty line
    # require a blank after the '%' because Perl uses "%list" and "%translate"
-    var l = getline(nextnonblank(1))
-    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
+    var line = getline(nextnonblank(1))
+    if line =~ '\<prolog\>' || line =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || line =~ ':-'
      setf prolog
    else
      setf perl
@@ -489,12 +528,14 @@ export def FTinc()
    # headers so assume POV-Ray
    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords
      setf pascal
+    elseif lines =~# '\<\%(require\|inherit\)\>' || lines =~# '[A-Z][A-Za-z0-9_:${}]*\s\+\%(??\|[?:+]\)\?= '
+      setf bitbake
    else
      FTasmsyntax()
      if exists("b:asmsyntax")
-	exe "setf " .. fnameescape(b:asmsyntax)
+        exe "setf " .. fnameescape(b:asmsyntax)
      else
-	setf pov
+        setf pov
      endif
    endif
  endif
@@ -637,26 +678,24 @@ export def McSetf()
 enddef

 # Called from filetype.vim and scripts.vim.
-export def SetFileTypeSH(name: string)
-  if did_filetype()
+# When "setft" is passed and false then the 'filetype' option is not set.
+export def SetFileTypeSH(name: string, setft = true): string
+  if setft && did_filetype()
    # Filetype was already detected
-    return
+    return ''
  endif
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
+  if setft && expand("<amatch>") =~ g:ft_ignore_pat
+    return ''
  endif
  if name =~ '\<csh\>'
    # Some .sh scripts contain #!/bin/csh.
-    SetFileTypeShell("csh")
-    return
+    return SetFileTypeShell("csh", setft)
  elseif name =~ '\<tcsh\>'
    # Some .sh scripts contain #!/bin/tcsh.
-    SetFileTypeShell("tcsh")
-    return
+    return SetFileTypeShell("tcsh", setft)
  elseif name =~ '\<zsh\>'
    # Some .sh scripts contain #!/bin/zsh.
-    SetFileTypeShell("zsh")
-    return
+    return SetFileTypeShell("zsh", setft)
  elseif name =~ '\<ksh\>'
    b:is_kornshell = 1
    if exists("b:is_bash")
@@ -673,7 +712,8 @@ export def SetFileTypeSH(name: string)
    if exists("b:is_sh")
      unlet b:is_sh
    endif
-  elseif name =~ '\<sh\>'
+  elseif name =~ '\<sh\>' || name =~ '\<dash\>'
+    # Ubuntu links "sh" to "dash", thus it is expected to work the same way
    b:is_sh = 1
    if exists("b:is_kornshell")
      unlet b:is_kornshell
@@ -682,34 +722,43 @@ export def SetFileTypeSH(name: string)
      unlet b:is_bash
    endif
  endif
-  SetFileTypeShell("sh")
+
+  return SetFileTypeShell("sh", setft)
 enddef

 # For shell-like file types, check for an "exec" command hidden in a comment,
 # as used for Tcl.
+# When "setft" is passed and false then the 'filetype' option is not set.
 # Also called from scripts.vim, thus can't be local to this script.
-export def SetFileTypeShell(name: string)
-  if did_filetype()
+export def SetFileTypeShell(name: string, setft = true): string
+  if setft && did_filetype()
    # Filetype was already detected
-    return
+    return ''
  endif
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
+  if setft && expand("<amatch>") =~ g:ft_ignore_pat
+    return ''
  endif
-  var l = 2
-  while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
+
+  var lnum = 2
+  while lnum < 20 && lnum < line("$") && getline(lnum) =~ '^\s*\(#\|$\)'
    # Skip empty and comment lines.
-    l += 1
+    lnum += 1
  endwhile
-  if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
+  if lnum < line("$") && getline(lnum) =~ '\s*exec\s' && getline(lnum - 1) =~ '^\s*#.*\\$'
    # Found an "exec" line after a comment with continuation
-    var n = substitute(getline(l), '\s*exec\s\+\([^ ]*/\)\=', '', '')
+    var n = substitute(getline(lnum), '\s*exec\s\+\([^ ]*/\)\=', '', '')
    if n =~ '\<tclsh\|\<wish'
-      setf tcl
-      return
+      if setft
+	setf tcl
+      endif
+      return 'tcl'
    endif
  endif
-  exe "setf " .. name
+
+  if setft
+    exe "setf " .. name
+  endif
+  return name
 enddef

 export def CSH()
@@ -770,10 +819,13 @@ export def SQL()
 enddef

 # This function checks the first 25 lines of file extension "sc" to resolve
-# detection between scala and SuperCollider
+# detection between scala and SuperCollider.
+# NOTE: We don't check for 'Class : Method', as this can easily be confused
+# 	with valid Scala like `val x : Int = 3`. So we instead only rely on
+# 	checks that can't be confused.
 export def FTsc()
  for lnum in range(1, min([line("$"), 25]))
-    if getline(lnum) =~# '[A-Za-z0-9]*\s:\s[A-Za-z0-9]\|var\s<\|classvar\s<\|\^this.*\||\w*|\|+\s\w*\s{\|\*ar\s'
+    if getline(lnum) =~# 'var\s<\|classvar\s<\|\^this.*\||\w\+|\|+\s\w*\s{\|\*ar\s'
      setf supercollider
      return
    endif
@@ -818,6 +870,44 @@ export def FTperl(): number
  return 0
 enddef

+# LambdaProlog and Standard ML signature files
+export def FTsig()
+  if exists("g:filetype_sig")
+    exe "setf " .. g:filetype_sig
+    return
+  endif
+
+  var lprolog_comment = '^\s*\%(/\*\|%\)'
+  var lprolog_keyword = '^\s*sig\s\+\a'
+  var sml_comment = '^\s*(\*'
+  var sml_keyword = '^\s*\%(signature\|structure\)\s\+\a'
+
+  var line = getline(nextnonblank(1))
+
+  if line =~ lprolog_comment || line =~# lprolog_keyword
+    setf lprolog
+  elseif line =~ sml_comment || line =~# sml_keyword
+    setf sml
+  endif
+enddef
+
+# This function checks the first 100 lines of files matching "*.sil" to
+# resolve detection between Swift Intermediate Language and SILE.
+export def FTsil()
+  for lnum in range(1, [line('$'), 100]->min())
+    var line: string = getline(lnum)
+    if line =~ '^\s*[\\%]'
+      setf sile
+      return
+    elseif line =~ '^\s*\S'
+      setf sil
+      return
+    endif
+  endfor
+  # no clue, default to "sil"
+  setf sil
+enddef
+
 export def FTsys()
  if exists("g:filetype_sys")
    exe "setf " .. g:filetype_sys
@@ -1010,5 +1100,78 @@ export def FTdat()
  endif
 enddef

+export def FTlsl()
+  if exists("g:filetype_lsl")
+    exe "setf " .. g:filetype_lsl
+  endif
+
+  var line = getline(nextnonblank(1))
+  if line =~ '^\s*%' || line =~# ':\s*trait\s*$'
+    setf larch
+  else
+    setf lsl
+  endif
+enddef
+
+export def FTtyp()
+  if exists("g:filetype_typ")
+    exe "setf " .. g:filetype_typ
+    return
+  endif
+
+  # Look for SQL type definition syntax
+  for line in getline(1, 200)
+    # SQL type files may define the casing
+    if line =~ '^CASE\s\==\s\=\(SAME\|LOWER\|UPPER\|OPPOSITE\)$'
+      setf sql
+      return
+    endif
+
+    # SQL type files may define some types as follows
+    if line =~ '^TYPE\s.*$'
+      setf sql
+      return
+    endif
+  endfor
+
+  # Otherwise, affect the typst filetype
+  setf typst
+enddef
+
+# Set the filetype of a *.v file to Verilog, V or Cog based on the first 200
+# lines.
+export def FTv()
+  if did_filetype()
+    # ":setf" will do nothing, bail out early
+    return
+  endif
+
+  for line in getline(1, 200)
+    if line[0] =~ '^\s*/'
+      # skip comment line
+      continue
+    endif
+
+    # Verilog: line ends with ';' followed by an optional variable number of
+    # spaces and an optional start of a comment.
+    # Example: " b <= a + 1; // Add 1".
+    if line =~ ';\(\s*\)\?\(/.*\)\?$'
+      setf verilog
+      return
+    endif
+
+    # Coq: line ends with a '.' followed by an optional variable number of
+    # spaces and an optional start of a comment.
+    # Example: "Definition x := 10. (*".
+    if line =~ '\.\(\s*\)\?\((\*.*\)\?$'
+      setf coq
+      return
+    endif
+  endfor
+
+  # No line matched, fall back to "v".
+  setf v
+enddef
+
 # Uncomment this line to check for compilation errors early
 # defcompile
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Feb 13
+# Last Change:	2023 Jun 09

 export def DetectFiletype()
  var line1 = getline(1)
@@ -44,7 +44,7 @@ def DetectFromHashBang(firstline: string)
  elseif line1 =~ '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
    name = substitute(line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
  else
-    name = substitute(line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
+    name = substitute(line1, '^#!\s*\S*[/\\]\(\f\+\).*', '\1', '')
  endif

  # tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
@@ -53,147 +53,164 @@ def DetectFromHashBang(firstline: string)
    name = 'wish'
  endif

-  # Bourne-like shell scripts: bash bash2 ksh ksh93 sh
-  if name =~ '^\(bash\d*\|\|ksh\d*\|sh\)\>'
-    call dist#ft#SetFileTypeSH(line1)
+  var ft = Exe2filetype(name, line1)
+  if ft != ''
+    exe 'setl ft=' .. ft
+  endif
+enddef
+
+# Returns the filetype name associated with program "name".
+# "line1" is the #! line at the top of the file.  Use the same as "name" if
+# not available.
+# Returns an empty string when not recognized.
+export def Exe2filetype(name: string, line1: string): string
+    # Bourne-like shell scripts: bash bash2 dash ksh ksh93 sh
+  if name =~ '^\(bash\d*\|dash\|ksh\d*\|sh\)\>'
+    return dist#ft#SetFileTypeSH(line1, false)

    # csh scripts
  elseif name =~ '^csh\>'
-    if exists("g:filetype_csh")
-      call dist#ft#SetFileTypeShell(g:filetype_csh)
-    else
-      call dist#ft#SetFileTypeShell("csh")
-    endif
+    return dist#ft#SetFileTypeShell(exists("g:filetype_csh") ? g:filetype_csh : 'csh', false)

    # tcsh scripts
  elseif name =~ '^tcsh\>'
-    call dist#ft#SetFileTypeShell("tcsh")
+    return dist#ft#SetFileTypeShell("tcsh", false)

    # Z shell scripts
  elseif name =~ '^zsh\>'
-    set ft=zsh
+    return 'zsh'

    # TCL scripts
  elseif name =~ '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
-    set ft=tcl
+    return 'tcl'

    # Expect scripts
  elseif name =~ '^expect\>'
-    set ft=expect
+    return 'expect'

    # Gnuplot scripts
  elseif name =~ '^gnuplot\>'
-    set ft=gnuplot
+    return 'gnuplot'

    # Makefiles
  elseif name =~ 'make\>'
-    set ft=make
+    return 'make'

    # Pike
  elseif name =~ '^pike\%(\>\|[0-9]\)'
-    set ft=pike
+    return 'pike'

    # Lua
  elseif name =~ 'lua'
-    set ft=lua
+    return 'lua'

    # Perl
  elseif name =~ 'perl'
-    set ft=perl
+    return 'perl'

    # PHP
  elseif name =~ 'php'
-    set ft=php
+    return 'php'

    # Python
  elseif name =~ 'python'
-    set ft=python
+    return 'python'

    # Groovy
  elseif name =~ '^groovy\>'
-    set ft=groovy
+    return 'groovy'

    # Raku
  elseif name =~ 'raku'
-    set ft=raku
+    return 'raku'

    # Ruby
  elseif name =~ 'ruby'
-    set ft=ruby
+    return 'ruby'

    # JavaScript
  elseif name =~ 'node\(js\)\=\>\|js\>' || name =~ 'rhino\>'
-    set ft=javascript
+    return 'javascript'

    # BC calculator
  elseif name =~ '^bc\>'
-    set ft=bc
+    return 'bc'

    # sed
  elseif name =~ 'sed\>'
-    set ft=sed
+    return 'sed'

    # OCaml-scripts
  elseif name =~ 'ocaml'
-    set ft=ocaml
+    return 'ocaml'

    # Awk scripts; also finds "gawk"
  elseif name =~ 'awk\>'
-    set ft=awk
+    return 'awk'

    # Website MetaLanguage
  elseif name =~ 'wml'
-    set ft=wml
+    return 'wml'

    # Scheme scripts
  elseif name =~ 'scheme'
-    set ft=scheme
+    return 'scheme'

    # CFEngine scripts
  elseif name =~ 'cfengine'
-    set ft=cfengine
+    return 'cfengine'

    # Erlang scripts
  elseif name =~ 'escript'
-    set ft=erlang
+    return 'erlang'

    # Haskell
  elseif name =~ 'haskell'
-    set ft=haskell
+    return 'haskell'

    # Scala
  elseif name =~ 'scala\>'
-    set ft=scala
+    return 'scala'

    # Clojure
  elseif name =~ 'clojure'
-    set ft=clojure
+    return 'clojure'

    # Free Pascal
  elseif name =~ 'instantfpc\>'
-    set ft=pascal
+    return 'pascal'

    # Fennel
  elseif name =~ 'fennel\>'
-    set ft=fennel
+    return 'fennel'

    # MikroTik RouterOS script
  elseif name =~ 'rsc\>'
-    set ft=routeros
+    return 'routeros'

    # Fish shell
  elseif name =~ 'fish\>'
-    set ft=fish
+    return 'fish'

    # Gforth
  elseif name =~ 'gforth\>'
-    set ft=forth
+    return 'forth'

    # Icon
  elseif name =~ 'icon\>'
-    set ft=icon
+    return 'icon'
+
+    # Guile
+  elseif name =~ 'guile'
+    return 'scheme'
+
+    # Nix
+  elseif name =~ 'nix-shell'
+    return 'nix'

  endif
+
+  return ''
 enddef


@@ -214,28 +231,28 @@ def DetectFromText(line1: string)
      || "\n" .. line1 .. "\n" .. line2 .. "\n" .. line3 ..
 	 "\n" .. line4 .. "\n" .. line5
 	 =~ '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>'
-    set ft=zsh
+    setl ft=zsh

  # ELM Mail files
  elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
-    set ft=mail
+    setl ft=mail

  # Mason
  elseif line1 =~ '^<[%&].*>'
-    set ft=mason
+    setl ft=mason

  # Vim scripts (must have '" vim' as the first line to trigger this)
  elseif line1 =~ '^" *[vV]im$'
-    set ft=vim
+    setl ft=vim

  # libcxx and libstdc++ standard library headers like "iostream" do not have
  # an extension, recognize the Emacs file mode.
  elseif line1 =~? '-\*-.*C++.*-\*-'
-    set ft=cpp
+    setl ft=cpp

  # MOO
  elseif line1 =~ '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
-    set ft=moo
+    setl ft=moo

    # Diff file:
    # - "diff" in first line (context diff)
@@ -254,11 +271,11 @@ def DetectFromText(line1: string)
 	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
 	 || (line1 =~ '^=== ' && ((line2 =~ '^=\{66\}' && line3 =~ '^--- ' && line4 =~ '^+++') || (line2 =~ '^--- ' && line3 =~ '^+++ ')))
 	 || (line1 =~ '^=== \(removed\|added\|renamed\|modified\)')
-    set ft=diff
+    setl ft=diff

    # PostScript Files (must have %!PS as the first line, like a2ps output)
  elseif line1 =~ '^%![ \t]*PS'
-    set ft=postscr
+    setl ft=postscr

    # M4 scripts: Guess there is a line that starts with "dnl".
  elseif line1 =~ '^\s*dnl\>'
@@ -266,64 +283,64 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^\s*dnl\>'
 	 || line4 =~ '^\s*dnl\>'
 	 || line5 =~ '^\s*dnl\>'
-    set ft=m4
+    setl ft=m4

    # AmigaDos scripts
  elseif $TERM == "amiga" && (line1 =~ "^;" || line1 =~? '^\.bra')
-    set ft=amiga
+    setl ft=amiga

    # SiCAD scripts (must have procn or procd as the first line to trigger this)
  elseif line1 =~? '^ *proc[nd] *$'
-    set ft=sicad
+    setl ft=sicad

    # Purify log files start with "****  Purify"
  elseif line1 =~ '^\*\*\*\*  Purify'
-    set ft=purifylog
+    setl ft=purifylog

    # XML
  elseif line1 =~ '<?\s*xml.*?>'
-    set ft=xml
+    setl ft=xml

    # XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
  elseif line1 =~ '\<DTD\s\+XHTML\s'
-    set ft=xhtml
+    setl ft=xhtml

    # HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
    # Avoid "doctype html", used by slim.
  elseif line1 =~? '<!DOCTYPE\s\+html\>'
-    set ft=html
+    setl ft=html

    # PDF
  elseif line1 =~ '^%PDF-'
-    set ft=pdf
+    setl ft=pdf

    # XXD output
  elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
-    set ft=xxd
+    setl ft=xxd

    # RCS/CVS log output
  elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
-    set ft=rcslog
+    setl ft=rcslog

    # CVS commit
  elseif line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
-    set ft=cvs
+    setl ft=cvs

    # Prescribe
  elseif line1 =~ '^!R!'
-    set ft=prescribe
+    setl ft=prescribe

    # Send-pr
  elseif line1 =~ '^SEND-PR:'
-    set ft=sendpr
+    setl ft=sendpr

    # SNNS files
  elseif line1 =~ '^SNNS network definition file'
-    set ft=snnsnet
+    setl ft=snnsnet
  elseif line1 =~ '^SNNS pattern definition file'
-    set ft=snnspat
+    setl ft=snnspat
  elseif line1 =~ '^SNNS result file'
-    set ft=snnsres
+    setl ft=snnsres

    # Virata
  elseif line1 =~ '^%.\{-}[Vv]irata'
@@ -331,79 +348,81 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^%.\{-}[Vv]irata'
 	 || line4 =~ '^%.\{-}[Vv]irata'
 	 || line5 =~ '^%.\{-}[Vv]irata'
-    set ft=virata
+    setl ft=virata

    # Strace
-  elseif line1 =~ '[0-9:.]* *execve(' || line1 =~ '^__libc_start_main'
-    set ft=strace
+    # inaccurate fast match first, then use accurate slow match
+  elseif (line1 =~ 'execve(' && line1 =~ '^[0-9:.]* *execve(')
+	   || line1 =~ '^__libc_start_main'
+    setl ft=strace

    # VSE JCL
  elseif line1 =~ '^\* $$ JOB\>' || line1 =~ '^// *JOB\>'
-    set ft=vsejcl
+    setl ft=vsejcl

    # TAK and SINDA
  elseif line4 =~ 'K & K  Associates' || line2 =~ 'TAK 2000'
-    set ft=takout
+    setl ft=takout
  elseif line3 =~ 'S Y S T E M S   I M P R O V E D '
-    set ft=sindaout
+    setl ft=sindaout
  elseif getline(6) =~ 'Run Date: '
-    set ft=takcmp
+    setl ft=takcmp
  elseif getline(9) =~ 'Node    File  1'
-    set ft=sindacmp
+    setl ft=sindacmp

    # DNS zone files
  elseif line1 .. line2 .. line3 .. line4 =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    set ft=bindzone
+    setl ft=bindzone

    # BAAN
  elseif line1 =~ '|\*\{1,80}' && line2 =~ 'VRC '
 	 || line2 =~ '|\*\{1,80}' && line3 =~ 'VRC '
-    set ft=baan
+    setl ft=baan

    # Valgrind
  elseif line1 =~ '^==\d\+== valgrind' || line3 =~ '^==\d\+== Using valgrind'
-    set ft=valgrind
+    setl ft=valgrind

    # Go docs
  elseif line1 =~ '^PACKAGE DOCUMENTATION$'
-    set ft=godoc
+    setl ft=godoc

    # Renderman Interface Bytestream
  elseif line1 =~ '^##RenderMan'
-    set ft=rib
+    setl ft=rib

    # Scheme scripts
  elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
-    set ft=scheme
+    setl ft=scheme

    # Git output
  elseif line1 =~ '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
-    set ft=git
+    setl ft=git

    # Gprof (gnu profiler)
  elseif line1 == 'Flat profile:'
 	&& line2 == ''
 	&& line3 =~ '^Each sample counts as .* seconds.$'
-    set ft=gprof
+    setl ft=gprof

    # Erlang terms
    # (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
  elseif line1 =~? '-\*-.*erlang.*-\*-'
-    set ft=erlang
+    setl ft=erlang

    # YAML
  elseif line1 =~ '^%YAML'
-    set ft=yaml
+    setl ft=yaml

    # MikroTik RouterOS script
  elseif line1 =~ '^#.*by RouterOS.*$'
-    set ft=routeros
+    setl ft=routeros

    # Sed scripts
    # #ncomment is allowed but most likely a false positive so require a space
    # before any trailing comment text
  elseif line1 =~ '^#n\%($\|\s\)'
-    set ft=sed
+    setl ft=sed

  else
    var lnum = 1
@@ -412,7 +431,7 @@ def DetectFromText(line1: string)
    endwhile
    if getline(lnum) =~ '^Index:\s\+\f\+$'
      # CVS diff
-      set ft=diff
+      setl ft=diff

      # locale input files: Formal Definitions of Cultural Conventions
      # filename must be like en_US, fr_FR@euro or en_US.UTF-8
--- a/runtime/autoload/dist/vimindent.vim
+++ b/runtime/autoload/dist/vimindent.vim
--- a/runtime/autoload/freebasic.vim
+++ b/runtime/autoload/freebasic.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	FreeBASIC
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 Mar 16
+" Last Change:	2022 June 24

 " Dialects can be one of fb, qb, fblite, or deprecated
 " Precedence is forcelang > #lang > lang
@@ -18,17 +18,16 @@ function! freebasic#GetDialect() abort

  " override with #lang directive or metacommand

-  let skip = "has('syntax_items') && synIDattr(synID(line('.'), col('.'), 1), 'name') =~ 'Comment$'"
  let pat = '\c^\s*\%(#\s*lang\s\+\|''\s*$lang\s*:\s*\)"\([^"]*\)"'

  let save_cursor = getcurpos()
  call cursor(1, 1)
-  let lnum = search(pat, 'n', '', '', skip)
+  let lnum = search(pat, 'cn')
  call setpos('.', save_cursor)

  if lnum
    let word = matchlist(getline(lnum), pat)[1]
-    if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
+    if word =~? '\<\%(fb\|deprecated\|fblite\|qb\)\>'
      let dialect = word
    else
      echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Aug 16, 2021
-" Version:	171
+" Date:		May 03, 2023
+" Version:	173
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
 endfor
 endif

-let g:loaded_netrw = "v171"
+let g:loaded_netrw = "v173"
 if !exists("s:NOTE")
 let s:NOTE    = 0
 let s:WARNING = 1
@@ -208,7 +208,6 @@ let g:netrw_localcopycmdopt    = ""
 let g:netrw_localcopydircmdopt = ""
 let g:netrw_localmkdiropt      = ""
 let g:netrw_localmovecmdopt    = ""
-let g:netrw_localrmdiropt      = ""

 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
@@ -1186,6 +1185,11 @@ endfun

 " ---------------------------------------------------------------------
 " netrw#Lexplore: toggle Explorer window, keeping it on the left of the current tab {{{2
+"   Uses  g:netrw_chgwin  : specifies the window where Lexplore files are to be opened
+"         t:netrw_lexposn : winsaveview() output (used on Lexplore window)
+"         t:netrw_lexbufnr: the buffer number of the Lexplore buffer  (internal to this function)
+"         s:lexplore_win  : window number of Lexplore window (serves to indicate which window is a Lexplore window)
+"         w:lexplore_buf  : buffer number of Lexplore window (serves to indicate which window is a Lexplore window)
 fun! netrw#Lexplore(count,rightside,...)
 "  call Dfunc("netrw#Lexplore(count=".a:count." rightside=".a:rightside.",...) a:0=".a:0." ft=".&ft)
  let curwin= winnr()
@@ -1202,6 +1206,8 @@ fun! netrw#Lexplore(count,rightside,...)
 "    call Decho("exe Explore ".fnameescape(a:1),'~'.expand("<slnum>"))
    exe "Explore ".fnameescape(a1)
    exe curwin."wincmd w"
+    let s:lexplore_win= curwin
+    let w:lexplore_buf= bufnr("%")
    if exists("t:netrw_lexposn")
 "     call Decho("forgetting t:netrw_lexposn",'~'.expand("<slnum>"))
     unlet t:netrw_lexposn
@@ -1276,7 +1282,7 @@ fun! netrw#Lexplore(count,rightside,...)
   let t:netrw_lexbufnr = bufnr("%")
   " done to prevent build-up of hidden buffers due to quitting and re-invocation of :Lexplore.
   " Since the intended use of :Lexplore is to have an always-present explorer window, the extra
-   " effort to mis-use :Lex is warranted.
+   " effort to prevent mis-use of :Lex is warranted.
   set bh=wipe
 "   call Decho("let t:netrw_lexbufnr=".t:netrw_lexbufnr) 
 "   call Decho("t:netrw_lexposn".(exists("t:netrw_lexposn")? string(t:netrw_lexposn) : " n/a"))
@@ -1680,7 +1686,7 @@ fun! s:NetrwOptionsSave(vt)
  endif
  let {a:vt}netrw_fokeep    = &l:fo           " formatoptions
  let {a:vt}netrw_gdkeep    = &l:gd           " gdefault
-  let {a:vt}netrw_gokeep    = &l:go           " guioptions
+  let {a:vt}netrw_gokeep    = &go             " guioptions
  let {a:vt}netrw_hidkeep   = &l:hidden
  let {a:vt}netrw_imkeep    = &l:im
  let {a:vt}netrw_iskkeep   = &l:isk
@@ -1751,8 +1757,9 @@ fun! s:NetrwOptionsSafe(islocal)
  if &cpo =~ 'a' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'a','','g')) | endif
  if &cpo =~ 'A' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'A','','g')) | endif
  setl fo=nroql2
-  " call s:NetrwSetSafeSetting("&go","begmr")
-  if &go =~ '\ca' | call s:NetrwSetSafeSetting("&go",substitute(&go,'\ca','','g')) | endif
+  if &go =~ 'a' | set go-=a | endif
+  if &go =~ 'A' | set go-=A | endif
+  if &go =~ 'P' | set go-=P | endif
  call s:NetrwSetSafeSetting("&l:hid",0)
  call s:NetrwSetSafeSetting("&l:im",0)
  setl isk+=@ isk+=* isk+=/
@@ -1791,9 +1798,13 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
  if !exists("{a:vt}netrw_optionsave")
 "   call Decho("case ".a:vt."netrw_optionsave : doesn't exist",'~'.expand("<slnum>"))
-"   call Decho("..doing filetype detect anyway")
-   filetype detect
-"   call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
+   if filereadable(expand("%"))
+"    call Decho("..doing filetype detect anyway")
+    filetype detect
+"    call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
+   else
+    setl ft=netrw
+   endif
 "   call Decho("..ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
 "   call Dret("s:NetrwOptionsRestore : ".a:vt."netrw_optionsave doesn't exist")
   return
@@ -1833,7 +1844,7 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("(s:NetrwOptionsRestore) #4 lines=".&lines)
  call s:NetrwRestoreSetting(a:vt."netrw_fokeep"   ,"&l:fo")
  call s:NetrwRestoreSetting(a:vt."netrw_gdkeep"   ,"&l:gd")
-  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&l:go")
+  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&go")
  call s:NetrwRestoreSetting(a:vt."netrw_hidkeep"  ,"&l:hidden")
 "  call Decho("(s:NetrwOptionsRestore) #5 lines=".&lines)
  call s:NetrwRestoreSetting(a:vt."netrw_imkeep"   ,"&l:im")
@@ -2981,13 +2992,19 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
   " rename buffer back to remote filename
   call s:NetrwBufRename(rfile)

+   " Jan 19, 2022: COMBAK -- bram problem with https://github.com/vim/vim/pull/9554.diff filetype
   " Detect filetype of local version of remote file.
   " Note that isk must not include a "/" for scripts.vim
   " to process this detection correctly.
-"   call Decho("detect filetype of local version of remote file",'~'.expand("<slnum>"))
-   let iskkeep= &l:isk
+"   call Decho("detect filetype of local version of remote file<".rfile.">",'~'.expand("<slnum>"))
+"   call Decho("..did_filetype()=".did_filetype())
+   setl ft=
+"   call Decho("..initial filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
+   let iskkeep= &isk
   setl isk-=/
-   let &l:isk= iskkeep
+   filetype detect
+"   call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
+   let &isk= iskkeep
 "   call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
   let line1 = 1
   let line2 = line("$")
@@ -4268,7 +4285,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
  endif
 "  call Decho("  bufnum#".bufnum,'~'.expand("<slnum>"))

-  " hijack the current buffer
+  " highjack the current buffer
  "   IF the buffer already has the desired name
  "   AND it is empty
  let curbuf = bufname("%")
@@ -4276,7 +4293,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
   let curbuf = getcwd()
  endif
 "  call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
-"  call Decho("deciding if netrw may hijack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
+"  call Decho("deciding if netrw may highjack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..dirname<".dirname.">  IF dirname == bufname",'~'.expand("<slnum>"))
 "  call Decho("..curbuf<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..line($)=".line("$")." AND this is 1",'~'.expand("<slnum>"))
@@ -4285,7 +4302,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "   call Dret("s:NetrwGetBuffer 0<cleared buffer> : highjacking buffer#".bufnr("%"))
   return 0
  else  " DEBUG
-"   call Decho("..did NOT hijack buffer",'~'.expand("<slnum>"))
+"   call Decho("..did NOT highjack buffer",'~'.expand("<slnum>"))
  endif
  " Aug 14, 2021: was thinking about looking for a [No Name] buffer here and using it, but that might cause problems

@@ -4321,19 +4338,25 @@ fun! s:NetrwGetBuffer(islocal,dirname)

  else " Re-use the buffer
 "   call Decho("--re-use buffer#".bufnum." (bufnum#".bufnum.">=0 AND bufexists(".bufnum.")=".bufexists(bufnum)."!=0)",'~'.expand("<slnum>"))
+   " ignore all events
   let eikeep= &ei
   setl ei=all
-   if getline(2) =~# '^" Netrw Directory Listing'
-"    call Decho("  getline(2)<".getline(2).'> matches "Netrw Directory Listing" : using keepalt b '.bufnum,'~'.expand("<slnum>"))
-    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
+
+   if &ft == "netrw"
+"    call Decho("buffer type is netrw; not using keepalt with b ".bufnum)
+    exe "sil! NetrwKeepj noswapfile b ".bufnum
+"    call Dredir("ls!","one")
   else
-"    call Decho("  getline(2)<".getline(2).'> does not match "Netrw Directory Listing" : using b '.bufnum,'~'.expand("<slnum>"))
-    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
+"    call Decho("buffer type is not netrw; using keepalt with b ".bufnum)
+    call s:NetrwEditBuf(bufnum)
+"    call Dredir("ls!","two")
   endif
 "   call Decho("  line($)=".line("$"),'~'.expand("<slnum>"))
   if bufname("%") == '.'
    call s:NetrwBufRename(getcwd())
   endif
+
+   " restore ei
   let &ei= eikeep

   if line("$") <= 1 && getline(1) == ""
@@ -4984,7 +5007,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)

    " the point where netrw actually edits the (local) file
    " if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will
-    " no keepalt to support  :e #  to return to a directory listing
+    " use keepalt to support  :e #  to return to a directory listing
    if !&mod
     " if e the new file would fail due to &mod, then don't change any of the flags
     let dolockout= 1
@@ -4995,12 +5018,8 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
     " others like c-^ to return to the netrw buffer
     " Apr 30, 2020: used to have e! here.  That can cause loss of a modified file,
     " so emit error E37 instead.
-     if exists("g:netrw_altfile") && g:netrw_altfile
-      exe "NetrwKeepj keepalt e ".fnameescape(dirname)
-     else
-      exe "NetrwKeepj e ".fnameescape(dirname)
-     endif
-"     call Decho("edit-a-file: after e! ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
+     call s:NetrwEditFile("e","",dirname)
+"     call Decho("edit-a-file: after e ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
     " COMBAK -- cuc cul related
     call s:NetrwCursor(1)
     if &hidden || &bufhidden == "hide"
@@ -5341,8 +5360,8 @@ fun! netrw#BrowseX(fname,remote)
     " g:Netrw_corehandler is a List of function references (see :help Funcref)
 "     call Decho("g:Netrw_corehandler is a List",'~'.expand("<slnum>"))
     for Fncref in g:Netrw_corehandler
-      if type(FncRef) == 2
-       call FncRef(a:fname)
+      if type(Fncref) == 2
+       call Fncref(a:fname)
      endif
     endfor
    endif
@@ -5415,6 +5434,8 @@ fun! netrw#BrowseX(fname,remote)
   else
    let redir= &srr . "/dev/null"
   endif
+  else
+   let redir= ""
  endif
 "  call Decho("set up redirection: redir{".redir."} srr{".&srr."}",'~'.expand("<slnum>"))

@@ -5704,6 +5725,35 @@ fun! s:NetrwClearExplore()
 "  call Dret("s:NetrwClearExplore")
 endfun

+" ---------------------------------------------------------------------
+" s:NetrwEditBuf: decides whether or not to use keepalt to edit a buffer {{{2
+fun! s:NetrwEditBuf(bufnum)
+"  call Dfunc("s:NetrwEditBuf(fname<".a:bufnum.">)")
+  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
+"   call Decho("exe sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum))
+   exe "sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum)
+  else
+"   call Decho("exe sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum))
+   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum)
+  endif
+"  call Dret("s:NetrwEditBuf")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwEditFile: decides whether or not to use keepalt to edit a file {{{2
+"    NetrwKeepj [keepalt] <OPT> <CMD> <FILENAME>
+fun! s:NetrwEditFile(cmd,opt,fname)
+"  call Dfunc("s:NetrwEditFile(cmd<".a:cmd.">,opt<".a:opt.">,fname<".a:fname.">)  ft<".&ft.">")
+  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
+"   call Decho("exe NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname))
+   exe "NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+  else
+"   call Decho("exe NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname))
+   exe "NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+  endif
+"  call Dret("s:NetrwEditFile")
+endfun
+
 " ---------------------------------------------------------------------
 " s:NetrwExploreListUniq: {{{2
 fun! s:NetrwExploreListUniq(explist)
@@ -7810,8 +7860,16 @@ fun! s:NetrwMarkFileMove(islocal)
 "    call Decho("movecmd<".movecmd."> (#3 linux or cygwin)",'~'.expand("<slnum>"))
   endif
   for fname in s:netrwmarkfilelist_{bufnr("%")}
+    if g:netrw_keepdir
+    " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
+     let fname= b:netrw_curdir."/".fname
+    endif
    if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
     let fname= substitute(fname,'/','\\','g')
+     if g:netrw_keepdir
+      " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
+      let fname= b:netrw_curdir."\\".fname
+     endif
    endif
 "    call Decho("system(".movecmd." ".s:ShellEscape(fname)." ".tgt.")",'~'.expand("<slnum>"))
    let ret= system(movecmd.g:netrw_localmovecmdopt." ".s:ShellEscape(fname)." ".tgt)
@@ -8569,21 +8627,28 @@ endfun
 "     choice = 2 : didn't save modified file, opened window
 "     choice = 3 : cancel open
 fun! s:NetrwPrevWinOpen(islocal)
-"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.")")
+"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.") win#".winnr())

  let ykeep= @@
  " grab a copy of the b:netrw_curdir to pass it along to newly split windows
  let curdir = b:netrw_curdir
+"  call Decho("COMBAK#1: mod=".&mod." win#".winnr())

  " get last window number and the word currently under the cursor
  let origwin   = winnr()
  let lastwinnr = winnr("$")
-  let curword   = s:NetrwGetWord()
-  let choice    = 0
-  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it
+"  call Decho("origwin#".origwin." lastwinnr#".lastwinnr)
+"  call Decho("COMBAK#2: mod=".&mod." win#".winnr())
+  let curword      = s:NetrwGetWord()
+  let choice       = 0
+  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it (s:NetrwTreeDir() will unlet s:prevwinopen)
+"  call Decho("COMBAK#3: mod=".&mod." win#".winnr())
  let s:treedir = s:NetrwTreeDir(a:islocal)
+"  call Decho("COMBAK#4: mod=".&mod." win#".winnr())
  let curdir    = s:treedir
+"  call Decho("COMBAK#5: mod=".&mod." win#".winnr())
 "  call Decho("winnr($)#".lastwinnr." curword<".curword.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#6: mod=".&mod." win#".winnr())

  let didsplit = 0
  if lastwinnr == 1
@@ -8606,11 +8671,26 @@ fun! s:NetrwPrevWinOpen(islocal)
 "   call Decho("did split",'~'.expand("<slnum>"))

  else
+"   call Decho("COMBAK#7: mod=".&mod." win#".winnr())
   NetrwKeepj call s:SaveBufVars()
+"   call Decho("COMBAK#8: mod=".&mod." win#".winnr())
   let eikeep= &ei
+"   call Decho("COMBAK#9: mod=".&mod." win#".winnr())
   setl ei=all
+"   call Decho("COMBAK#10: mod=".&mod." win#".winnr())
   wincmd p
+"  call Decho("COMBAK#11: mod=".&mod)
 "   call Decho("wincmd p  (now in win#".winnr().") curdir<".curdir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#12: mod=".&mod)
+   
+   if exists("s:lexplore_win") && s:lexplore_win == winnr()
+    " whoops -- user trying to open file in the Lexplore window.
+    " Use Lexplore's opening-file window instead.
+"    call Decho("whoops -- user trying to open file in Lexplore Window. Use win#".g:netrw_chgwin." instead")
+"    exe g:netrw_chgwin."wincmd w"
+     wincmd p
+     call s:NetrwBrowse(0,s:NetrwBrowseChgDir(0,s:NetrwGetWord()))
+   endif

   " prevwinnr: the window number of the "prev" window
   " prevbufnr: the buffer number of the buffer in the "prev" window
@@ -8620,8 +8700,10 @@ fun! s:NetrwPrevWinOpen(islocal)
   let prevbufname = bufname("%")
   let prevmod     = &mod
   let bnrcnt      = 0
+"   call Decho("COMBAK#13: mod=".&mod." win#".winnr())
   NetrwKeepj call s:RestoreBufVars()
 "   call Decho("after wincmd p: win#".winnr()." win($)#".winnr("$")." origwin#".origwin." &mod=".&mod." bufname(%)<".bufname("%")."> prevbufnr=".prevbufnr,'~'.expand("<slnum>"))
+"   call Decho("COMBAK#14: mod=".&mod." win#".winnr())

   " if the previous window's buffer has been changed (ie. its modified flag is set),
   " and it doesn't appear in any other extant window, then ask the
@@ -8631,6 +8713,7 @@ fun! s:NetrwPrevWinOpen(islocal)
    windo if winbufnr(0) == prevbufnr | let bnrcnt=bnrcnt+1 | endif
 "    call Decho("prevbufnr=".prevbufnr." bnrcnt=".bnrcnt." buftype=".&bt." winnr()=".winnr()." prevwinnr#".prevwinnr,'~'.expand("<slnum>"))
    exe prevwinnr."wincmd w"
+"    call Decho("COMBAK#15: mod=".&mod." win#".winnr())

    if bnrcnt == 1 && &hidden == 0
     " only one copy of the modified buffer in a window, and
@@ -8638,6 +8721,7 @@ fun! s:NetrwPrevWinOpen(islocal)
     let choice = confirm("Save modified buffer<".prevbufname."> first?","&Yes\n&No\n&Cancel")
 "     call Decho("prevbufname<".prevbufname."> choice=".choice." current-winnr#".winnr(),'~'.expand("<slnum>"))
     let &ei= eikeep
+"     call Decho("COMBAK#16: mod=".&mod." win#".winnr())

     if choice == 1
      " Yes -- write file & then browse
@@ -8670,6 +8754,7 @@ fun! s:NetrwPrevWinOpen(islocal)
   endif
   let &ei= eikeep
  endif
+"  call Decho("COMBAK#17: mod=".&mod." win#".winnr())

  " restore b:netrw_curdir (window split/enew may have lost it)
  let b:netrw_curdir= curdir
@@ -9357,19 +9442,23 @@ fun! s:NetrwTreeDir(islocal)
  if exists("s:prevwinopen")
   unlet s:prevwinopen
  endif
+"  call Decho("COMBAK#18 : mod=".&mod." win#".winnr())

  if !exists("b:netrw_curdir") || b:netrw_curdir == ""
   let b:netrw_curdir= getcwd()
  endif
  let treedir = b:netrw_curdir
 "  call Decho("set initial treedir<".treedir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#19 : mod=".&mod." win#".winnr())

  let s:treecurpos= winsaveview()
 "  call Decho("saving posn to s:treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#20 : mod=".&mod." win#".winnr())

  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("w:netrw_liststyle is TREELIST:",'~'.expand("<slnum>"))
 "   call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#21 : mod=".&mod." win#".winnr())

   " extract tree directory if on a line specifying a subdirectory (ie. ends with "/")
   let curline= substitute(getline('.'),"\t -->.*$",'','')
@@ -9385,6 +9474,7 @@ fun! s:NetrwTreeDir(islocal)
 "    call Decho("do not extract tree subdirectory from current line and set treedir to empty",'~'.expand("<slnum>"))
    let treedir= ""
   endif
+"  call Decho("COMBAK#22 : mod=".&mod." win#".winnr())

   " detect user attempting to close treeroot
 "   call Decho("check if user is attempting to close treeroot",'~'.expand("<slnum>"))
@@ -9400,10 +9490,12 @@ fun! s:NetrwTreeDir(islocal)
 "   else " Decho
 "    call Decho(".user not attempting to close treeroot",'~'.expand("<slnum>"))
   endif
+"  call Decho("COMBAK#23 : mod=".&mod." win#".winnr())

 "   call Decho("islocal=".a:islocal." curline<".curline.">",'~'.expand("<slnum>"))
   let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
 "   call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(potentialdir),'~'.expand("<slnum>"))
+"  call Decho("COMBAK#24 : mod=".&mod." win#".winnr())

   " COMBAK: a symbolic link may point anywhere -- so it will be used to start a new treetop
 "   if a:islocal && curline =~ '@$' && isdirectory(s:NetrwFile(potentialdir))
@@ -9417,10 +9509,12 @@ fun! s:NetrwTreeDir(islocal)
    let treedir = s:NetrwTreePath(w:netrw_treetop)
 "   endif
  endif
+"  call Decho("COMBAK#25 : mod=".&mod." win#".winnr())

  " sanity maintenance: keep those //s away...
  let treedir= substitute(treedir,'//$','/','')
 "  call Decho("treedir<".treedir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#26 : mod=".&mod." win#".winnr())

 "  call Dret("s:NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".(exists("s:treecurpos")? string(s:treecurpos) : 'n/a').">")
  return treedir
@@ -10791,7 +10885,8 @@ fun! netrw#LocalBrowseCheck(dirname)
 "  call Dfunc("netrw#LocalBrowseCheck(dirname<".a:dirname.">)")
 "  call Decho("isdir<".a:dirname."> =".isdirectory(s:NetrwFile(a:dirname)).((exists("s:treeforceredraw")? " treeforceredraw" : "")).'~'.expand("<slnum>"))
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
-"  call Dredir("ls!","netrw#LocalBrowseCheck")
+  " getting E930: Cannot use :redir inside execute
+""  call Dredir("ls!","netrw#LocalBrowseCheck")
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 "  call Decho("current buffer#".bufnr("%")."<".bufname("%")."> ft=".&ft,'~'.expand("<slnum>"))

@@ -11085,12 +11180,15 @@ fun! s:LocalListing()

   if w:netrw_liststyle == s:LONGLIST
    let sz   = getfsize(filename)
-    let fsz  = strpart("               ",1,15-strlen(sz)).sz
+	let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
+    let szlen = (szlen > 0) ? szlen : 0
+    let fsz  = printf("%".szlen."S",sz)
+
    if g:netrw_sizestyle =~# "[hH]"
     let sz= s:NetrwHumanReadable(sz)
    endif
-    let longfile= printf("%-".(g:netrw_maxfilenamelen+1)."s",pfile)
-    let pfile   = longfile.sz." ".strftime(g:netrw_timefmt,getftime(filename))
+	let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
+    let pfile   = longfile."  ".sz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
   endif

@@ -11389,34 +11487,8 @@ fun! s:NetrwLocalRmFile(path,fname,all)
   let rmfile= substitute(rmfile,'[\/]$','','e')

   if all || ok =~# 'y\%[es]' || ok == ""
-    if v:version < 704 || (v:version == 704 && !has("patch1107"))
-" "    call Decho("1st attempt: system(netrw#WinPath(".g:netrw_localrmdir.') '.s:ShellEscape(rmfile).')','~'.expand("<slnum>"))
-     call system(netrw#WinPath(g:netrw_localrmdir).' '.s:ShellEscape(rmfile))
-" "    call Decho("v:shell_error=".v:shell_error,'~'.expand("<slnum>"))
-
-     if v:shell_error != 0
-" "     call Decho("2nd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-      let errcode= s:NetrwDelete(rmfile)
-" "     call Decho("errcode=".errcode,'~'.expand("<slnum>"))
-
-      if errcode != 0
-       if has("unix")
-" "       call Decho("3rd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-	call system("rm ".s:ShellEscape(rmfile))
-	if v:shell_error != 0 && !exists("g:netrw_quiet")
-	 call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
-	 let ok="no"
-	endif
-       elseif !exists("g:netrw_quiet")
-	call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
-	let ok="no"
-       endif
-      endif
-     endif
-    else
-     if delete(rmfile,"d")
-      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
-     endif
+    if delete(rmfile,"d")
+     call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
    endif
   endif
  endif
@@ -12011,13 +12083,13 @@ fun! s:NetrwEnew(...)
  if exists("b:netrw_prvdir")         |let netrw_prvdir          = b:netrw_prvdir         |endif

  NetrwKeepj call s:NetrwOptionsRestore("w:")
-"  call Decho("generate a buffer with NetrwKeepj keepalt enew!",'~'.expand("<slnum>"))
+"  call Decho("generate a buffer with NetrwKeepj enew!",'~'.expand("<slnum>"))
  " when tree listing uses file TreeListing... a new buffer is made.
  " Want the old buffer to be unlisted.
  " COMBAK: this causes a problem, see P43
 "  setl nobl
  let netrw_keepdiff= &l:diff
-  noswapfile NetrwKeepj keepalt enew!
+  call s:NetrwEditFile("enew!","","")
  let &l:diff= netrw_keepdiff
 "  call Decho("bufnr($)=".bufnr("$")."<".bufname(bufnr("$"))."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
  NetrwKeepj call s:NetrwOptionsSave("w:")
@@ -12066,7 +12138,7 @@ endfun
 " s:NetrwExe: executes a string using "!" {{{2
 fun! s:NetrwExe(cmd)
 "  call Dfunc("s:NetrwExe(a:cmd<".a:cmd.">)")
-  if has("win32") && &shell !~? 'cmd' && !g:netrw_cygwin
+  if has("win32") && &shell !~? 'cmd\|pwsh\|powershell' && !g:netrw_cygwin
 "    call Decho("using win32:",expand("<slnum>"))
    let savedShell=[&shell,&shellcmdflag,&shellxquote,&shellxescape,&shellquote,&shellpipe,&shellredir,&shellslash]
    set shell& shellcmdflag& shellxquote& shellxescape&
@@ -12735,3 +12807,54 @@ unlet s:keepcpo
 " Modelines: {{{1
 " ===============
 " vim:ts=8 fdm=marker
+" doing autoload/netrw.vim version v172g ~57
+" varname<g:netrw_dirhistcnt> value=0 ~1
+" varname<s:THINLIST> value=0 ~1
+" varname<s:LONGLIST> value=1 ~1
+" varname<s:WIDELIST> value=2 ~1
+" varname<s:TREELIST> value=3 ~1
+" varname<s:MAXLIST> value=4 ~1
+" varname<g:netrw_use_errorwindow> value=2 ~1
+" varname<g:netrw_http_xcmd> value=-q -O ~1
+" varname<g:netrw_http_put_cmd> value=curl -T ~1
+" varname<g:netrw_keepj> value=keepj ~1
+" varname<g:netrw_rcp_cmd> value=rcp ~1
+" varname<g:netrw_rsync_cmd> value=rsync ~1
+" varname<g:netrw_rsync_sep> value=/ ~1
+" varname<g:netrw_scp_cmd> value=scp -q ~1
+" varname<g:netrw_sftp_cmd> value=sftp ~1
+" varname<g:netrw_ssh_cmd> value=ssh ~1
+" varname<g:netrw_alto> value=0 ~1
+" varname<g:netrw_altv> value=1 ~1
+" varname<g:netrw_banner> value=1 ~1
+" varname<g:netrw_browse_split> value=0 ~1
+" varname<g:netrw_bufsettings> value=noma nomod nonu nobl nowrap ro nornu ~1
+" varname<g:netrw_chgwin> value=-1 ~1
+" varname<g:netrw_clipboard> value=1 ~1
+" varname<g:netrw_compress> value=gzip ~1
+" varname<g:netrw_ctags> value=ctags ~1
+" varname<g:netrw_cursor> value=2 ~1
+" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl]
+" varname<g:netrw_cygdrive> value=/cygdrive ~1
+" varname<s:didstarstar> value=0 ~1
+" varname<g:netrw_dirhistcnt> value=0 ~1
+" varname<g:netrw_decompress> value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1
+" varname<g:netrw_dirhistmax> value=10 ~1
+" varname<g:netrw_errorlvl> value=0 ~1
+" varname<g:netrw_fastbrowse> value=1 ~1
+" varname<g:netrw_ftp_browse_reject> value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1
+" varname<g:netrw_ftpmode> value=binary ~1
+" varname<g:netrw_hide> value=1 ~1
+" varname<g:netrw_keepdir> value=1 ~1
+" varname<g:netrw_list_hide> value= ~1
+" varname<g:netrw_localmkdir> value=mkdir ~1
+" varname<g:netrw_remote_mkdir> value=mkdir ~1
+" varname<g:netrw_liststyle> value=0 ~1
+" varname<g:netrw_markfileesc> value=*./[\~ ~1
+" varname<g:netrw_maxfilenamelen> value=32 ~1
+" varname<g:netrw_menu> value=1 ~1
+" varname<g:netrw_mkdir_cmd> value=ssh USEPORT HOSTNAME mkdir ~1
+" varname<g:netrw_mousemaps> value=1 ~1
+" varname<g:netrw_retmap> value=0 ~1
+" varname<g:netrw_chgperm> value=chmod PERM FILENAME ~1
+" varname<g:netrw_preview> value=0 ~1
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Aug 12, 2021
+" Date:		Nov 15, 2021
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Version:	17	ASTRO-ONLY
+" Version:	18
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v17"
+let g:loaded_netrwSettings = "v18"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -159,8 +159,6 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_localmkdiropt     = '.g:netrw_localmkdiropt
  put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
  put = 'let g:netrw_localmovecmdopt   = '.g:netrw_localmovecmdopt
-  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
-  put = 'let g:netrw_localrmdiropt     = '.g:netrw_localrmdiropt
  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
  put = 'let g:netrw_menu              = '.g:netrw_menu
  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
--- a/runtime/autoload/python.vim
+++ b/runtime/autoload/python.vim
@@ -0,0 +1,249 @@
+" Support for Python indenting, see runtime/indent/python.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" need to inspect some old g:pyindent_* variables to be backward compatible
+let g:python_indent = extend(get(g:, 'python_indent', {}), #{
+  \ closed_paren_align_last_line: v:true,
+  \ open_paren: get(g:, 'pyindent_open_paren', 'shiftwidth() * 2'),
+  \ nested_paren: get(g:, 'pyindent_nested_paren', 'shiftwidth()'),
+  \ continue: get(g:, 'pyindent_continue', 'shiftwidth() * 2'),
+  "\ searchpair() can be slow, limit the time to 150 msec or what is put in
+  "\ g:python_indent.searchpair_timeout
+  \ searchpair_timeout: get(g:, 'pyindent_searchpair_timeout', 150),
+  "\ Identing inside parentheses can be very slow, regardless of the searchpair()
+  "\ timeout, so let the user disable this feature if he doesn't need it
+  \ disable_parentheses_indenting: get(g:, 'pyindent_disable_parentheses_indenting', v:false),
+  \ }, 'keep')
+
+let s:maxoff = 50       " maximum number of lines to look backwards for ()
+
+function s:SearchBracket(fromlnum, flags)
+  return searchpairpos('[[({]', '', '[])}]', a:flags,
+          \ {-> synstack('.', col('.'))
+          \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
+          \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
+endfunction
+
+" See if the specified line is already user-dedented from the expected value.
+function s:Dedented(lnum, expected)
+  return indent(a:lnum) <= a:expected - shiftwidth()
+endfunction
+
+" Some other filetypes which embed Python have slightly different indent
+" rules (e.g. bitbake). Those filetypes can pass an extra funcref to this
+" function which is evaluated below.
+function python#GetIndent(lnum, ...)
+  let ExtraFunc = a:0 > 0 ? a:1 : 0
+
+  " If this line is explicitly joined: If the previous line was also joined,
+  " line it up with that one, otherwise add two 'shiftwidth'
+  if getline(a:lnum - 1) =~ '\\$'
+    if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
+      return indent(a:lnum - 1)
+    endif
+    return indent(a:lnum - 1) + get(g:, 'pyindent_continue', g:python_indent.continue)->eval()
+  endif
+
+  " If the start of the line is in a string don't change the indent.
+  if has('syntax_items')
+	\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
+    return -1
+  endif
+
+  " Search backwards for the previous non-empty line.
+  let plnum = prevnonblank(v:lnum - 1)
+
+  if plnum == 0
+    " This is the first non-empty line, use zero indent.
+    return 0
+  endif
+
+  if g:python_indent.disable_parentheses_indenting == 1
+    let plindent = indent(plnum)
+    let plnumstart = plnum
+  else
+    " Indent inside parens.
+    " Align with the open paren unless it is at the end of the line.
+    " E.g.
+    "     open_paren_not_at_EOL(100,
+    "                           (200,
+    "                            300),
+    "                           400)
+    "     open_paren_at_EOL(
+    "         100, 200, 300, 400)
+    call cursor(a:lnum, 1)
+    let [parlnum, parcol] = s:SearchBracket(a:lnum, 'nbW')
+    if parlnum > 0
+      if parcol != col([parlnum, '$']) - 1
+        return parcol
+      elseif getline(a:lnum) =~ '^\s*[])}]' && !g:python_indent.closed_paren_align_last_line
+        return indent(parlnum)
+      endif
+    endif
+
+    call cursor(plnum, 1)
+
+    " If the previous line is inside parenthesis, use the indent of the starting
+    " line.
+    let [parlnum, _] = s:SearchBracket(plnum, 'nbW')
+    if parlnum > 0
+      if a:0 > 0 && ExtraFunc(parlnum)
+        " We may have found the opening brace of a bitbake Python task, e.g. 'python do_task {'
+        " If so, ignore it here - it will be handled later.
+        let parlnum = 0
+        let plindent = indent(plnum)
+        let plnumstart = plnum
+      else
+        let plindent = indent(parlnum)
+        let plnumstart = parlnum
+      endif
+    else
+      let plindent = indent(plnum)
+      let plnumstart = plnum
+    endif
+
+    " When inside parenthesis: If at the first line below the parenthesis add
+    " two 'shiftwidth', otherwise same as previous line.
+    " i = (a
+    "       + b
+    "       + c)
+    call cursor(a:lnum, 1)
+    let [p, _] = s:SearchBracket(a:lnum, 'bW')
+    if p > 0
+      if a:0 > 0 && ExtraFunc(p)
+        " Currently only used by bitbake
+        " Handle first non-empty line inside a bitbake Python task
+        if p == plnum
+          return shiftwidth()
+        endif
+
+        " Handle the user actually trying to close a bitbake Python task
+        let line = getline(a:lnum)
+        if line =~ '^\s*}'
+          return -2
+        endif
+
+        " Otherwise ignore the brace
+        let p = 0
+      else
+        if p == plnum
+          " When the start is inside parenthesis, only indent one 'shiftwidth'.
+          let [pp, _] = s:SearchBracket(a:lnum, 'bW')
+          if pp > 0
+            return indent(plnum)
+              \ + get(g:, 'pyindent_nested_paren', g:python_indent.nested_paren)->eval()
+          endif
+          return indent(plnum)
+            \ + get(g:, 'pyindent_open_paren', g:python_indent.open_paren)->eval()
+        endif
+        if plnumstart == p
+          return indent(plnum)
+        endif
+        return plindent
+      endif
+    endif
+  endif
+
+
+  " Get the line and remove a trailing comment.
+  " Use syntax highlighting attributes when possible.
+  let pline = getline(plnum)
+  let pline_len = strlen(pline)
+  if has('syntax_items')
+    " If the last character in the line is a comment, do a binary search for
+    " the start of the comment.  synID() is slow, a linear search would take
+    " too long on a long line.
+    if synstack(plnum, pline_len)
+    \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
+      let min = 1
+      let max = pline_len
+      while min < max
+	let col = (min + max) / 2
+        if synstack(plnum, col)
+        \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
+	  let max = col
+	else
+	  let min = col + 1
+	endif
+      endwhile
+      let pline = strpart(pline, 0, min - 1)
+    endif
+  else
+    let col = 0
+    while col < pline_len
+      if pline[col] == '#'
+	let pline = strpart(pline, 0, col)
+	break
+      endif
+      let col = col + 1
+    endwhile
+  endif
+
+  " If the previous line ended with a colon, indent this line
+  if pline =~ ':\s*$'
+    return plindent + shiftwidth()
+  endif
+
+  " If the previous line was a stop-execution statement...
+  if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
+    " See if the user has already dedented
+    if s:Dedented(a:lnum, indent(plnum))
+      " If so, trust the user
+      return -1
+    endif
+    " If not, recommend one dedent
+    return indent(plnum) - shiftwidth()
+  endif
+
+  " If the current line begins with a keyword that lines up with "try"
+  if getline(a:lnum) =~ '^\s*\(except\|finally\)\>'
+    let lnum = a:lnum - 1
+    while lnum >= 1
+      if getline(lnum) =~ '^\s*\(try\|except\)\>'
+	let ind = indent(lnum)
+	if ind >= indent(a:lnum)
+	  return -1	" indent is already less than this
+	endif
+	return ind	" line up with previous try or except
+      endif
+      let lnum = lnum - 1
+    endwhile
+    return -1		" no matching "try"!
+  endif
+
+  " If the current line begins with a header keyword, dedent
+  if getline(a:lnum) =~ '^\s*\(elif\|else\)\>'
+
+    " Unless the previous line was a one-liner
+    if getline(plnumstart) =~ '^\s*\(for\|if\|elif\|try\)\>'
+      return plindent
+    endif
+
+    " Or the user has already dedented
+    if s:Dedented(a:lnum, plindent)
+      return -1
+    endif
+
+    return plindent - shiftwidth()
+  endif
+
+  " When after a () construct we probably want to go back to the start line.
+  " a = (b
+  "       + c)
+  " here
+  if parlnum > 0
+    " ...unless the user has already dedented
+    if s:Dedented(a:lnum, plindent)
+        return -1
+    else
+        return plindent
+    endif
+  endif
+
+  return -1
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2019 Aug 16
+" Last Change: 2023 Jan 01
 "
 " Additional contributors:
 "
@@ -351,63 +351,65 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
  let s:old_magic = &magic
  set magic

-  if s:settings.use_xhtml
-    if s:settings.encoding != ""
-      let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
-    else
-      let xml_line = "<?xml version=\"1.0\"?>"
-    endif
-    let tag_close = ' />'
-  endif
-
-  let style = [s:settings.use_xhtml ? "" : '-->']
-  let body_line = ''
-
  let html = []
-  let s:html5 = 0
-  if s:settings.use_xhtml
-    call add(html, xml_line)
-  endif
-  if s:settings.use_xhtml
-    call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
-    call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
-  elseif s:settings.use_css && !s:settings.no_pre
-    call add(html, "<!DOCTYPE html>")
-    call add(html, '<html>')
-    let s:html5 = 1
-  else
-    call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
-    call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
-    call add(html, '<html>')
-  endif
-  call add(html, '<head>')
-
-  " include encoding as close to the top as possible, but only if not already
-  " contained in XML information
-  if s:settings.encoding != "" && !s:settings.use_xhtml
-    if s:html5
-      call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
-    else
-      call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+  if !s:settings.no_doc
+    if s:settings.use_xhtml
+      if s:settings.encoding != ""
+	let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
+      else
+	let xml_line = "<?xml version=\"1.0\"?>"
+      endif
+      let tag_close = ' />'
    endif
+
+    let style = [s:settings.use_xhtml ? "" : '-->']
+    let body_line = ''
+
+    let s:html5 = 0
+    if s:settings.use_xhtml
+      call add(html, xml_line)
+    endif
+    if s:settings.use_xhtml
+      call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
+      call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
+    elseif s:settings.use_css && !s:settings.no_pre
+      call add(html, "<!DOCTYPE html>")
+      call add(html, '<html>')
+      let s:html5 = 1
+    else
+      call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
+      call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
+      call add(html, '<html>')
+    endif
+    call add(html, '<head>')
+
+    " include encoding as close to the top as possible, but only if not already
+    " contained in XML information
+    if s:settings.encoding != "" && !s:settings.use_xhtml
+      if s:html5
+	call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
+      else
+	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+      endif
+    endif
+
+    call add(html, '<title>diff</title>')
+    call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
+    call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
+    call add(html, '<meta name="settings" content="'.
+	  \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
+	  \ ',prevent_copy='.s:settings.prevent_copy.
+	  \ ',use_input_for_pc='.s:settings.use_input_for_pc.
+	  \ '"'.tag_close)
+    call add(html, '<meta name="colorscheme" content="'.
+	  \ (exists('g:colors_name')
+	  \ ? g:colors_name
+	  \ : 'none'). '"'.tag_close)
+
+    call add(html, '</head>')
+    let body_line_num = len(html)
+    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
  endif
-
-  call add(html, '<title>diff</title>')
-  call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
-  call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
-  call add(html, '<meta name="settings" content="'.
-	\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	\ ',prevent_copy='.s:settings.prevent_copy.
-	\ ',use_input_for_pc='.s:settings.use_input_for_pc.
-	\ '"'.tag_close)
-  call add(html, '<meta name="colorscheme" content="'.
-	\ (exists('g:colors_name')
-	\ ? g:colors_name
-	\ : 'none'). '"'.tag_close)
-
-  call add(html, '</head>')
-  let body_line_num = len(html)
-  call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
  call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")

  call add(html, '<tr>')
@@ -430,47 +432,53 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    " When not using CSS or when using xhtml, the <body> line can be important.
    " Assume it will be the same for all buffers and grab it from the first
    " buffer. Similarly, need to grab the body end line as well.
-    if body_line == ''
+    if !s:settings.no_doc
+      if body_line == ''
+	1
+	call search('<body')
+	let body_line = getline('.')
+	$
+	call search('</body>', 'b')
+	let s:body_end_line = getline('.')
+      endif
+
+      " Grab the style information. Some of this will be duplicated so only insert
+      " it if it's not already there. {{{
      1
-      call search('<body')
-      let body_line = getline('.')
-      $
-      call search('</body>', 'b')
-      let s:body_end_line = getline('.')
-    endif
-
-    " Grab the style information. Some of this will be duplicated so only insert
-    " it if it's not already there. {{{
-    1
-    let style_start = search('^<style\( type="text/css"\)\?>')
-    1
-    let style_end = search('^</style>')
-    if style_start > 0 && style_end > 0
-      let buf_styles = getline(style_start + 1, style_end - 1)
-      for a_style in buf_styles
-	if index(style, a_style) == -1
-	  if diff_style_start == 0
-	    if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
-	      let diff_style_start = len(style)-1
+      let style_start = search('^<style\( type="text/css"\)\?>')
+      1
+      let style_end = search('^</style>')
+      if style_start > 0 && style_end > 0
+	let buf_styles = getline(style_start + 1, style_end - 1)
+	for a_style in buf_styles
+	  if index(style, a_style) == -1
+	    if diff_style_start == 0
+	      if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
+		let diff_style_start = len(style)-1
+	      endif
 	    endif
+	    call insert(style, a_style, insert_index)
+	    let insert_index += 1
 	  endif
-	  call insert(style, a_style, insert_index)
-	  let insert_index += 1
-	endif
-      endfor
-    endif " }}}
+	endfor
+      endif " }}}

-    " everything new will get added before the diff styles so diff highlight
-    " properly overrides normal highlight
-    if diff_style_start != 0
-      let insert_index = diff_style_start
+      " everything new will get added before the diff styles so diff highlight
+      " properly overrides normal highlight
+      if diff_style_start != 0
+	let insert_index = diff_style_start
+      endif
+
+      " Delete those parts that are not needed so we can include the rest into the
+      " resulting table.
+      1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
+      $
+      ?</body>?,$d_
+    elseif !s:settings.no_modeline
+      " remove modeline from source files if it is included and we haven't deleted
+      " due to removing html footer already
+      $d
    endif
-
-    " Delete those parts that are not needed so we can include the rest into the
-    " resulting table.
-    1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
-    $
-    ?</body>?,$d_
    let temp = getline(1,'$')
    " clean out id on the main content container because we already set it on
    " the table
@@ -478,7 +486,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    " undo deletion of start and end part
    " so we can later save the file as valid html
    " TODO: restore using grabbed lines if undolevel is 1?
-    normal! 2u
+    if !s:settings.no_doc
+      normal! 2u
+    elseif !s:settings.no_modeline
+      normal! u
+    endif
    if s:settings.use_css
      call add(html, '<td><div>')
    elseif s:settings.use_xhtml
@@ -495,17 +507,23 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    quit!
  endfor

-  let html[body_line_num] = body_line
+  if !s:settings.no_doc
+    let html[body_line_num] = body_line
+  endif

  call add(html, '</tr>')
  call add(html, '</table>')
-  call add(html, s:body_end_line)
-  call add(html, '</html>')
+  if !s:settings.no_doc
+    call add(html, s:body_end_line)
+    call add(html, '</html>')
+  endif

  " The generated HTML is admittedly ugly and takes a LONG time to fold.
  " Make sure the user doesn't do syntax folding when loading a generated file,
  " using a modeline.
-  call add(html, '<!-- vim: set foldmethod=manual : -->')
+  if !s:settings.no_modeline
+    call add(html, '<!-- vim: set foldmethod=manual : -->')
+  endif

  let i = 1
  let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
@@ -542,129 +560,131 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{

  call append(0, html)

-  if len(style) > 0
-    1
-    let style_start = search('^</head>')-1
+  if !s:settings.no_doc
+    if len(style) > 0
+      1
+      let style_start = search('^</head>')-1

-    " add required javascript in reverse order so we can just call append again
-    " and again without adjusting {{{
+      " add required javascript in reverse order so we can just call append again
+      " and again without adjusting {{{

-    let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
+      let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids

-    " insert script closing tag if needed
-    if s:uses_script
-      call append(style_start, [
-	    \ '',
-	    \ s:settings.use_xhtml ? '//]]>' : '-->',
-	    \ "</script>"
-	    \ ])
-    endif
-
-    " insert javascript to get IDs from line numbers, and to open a fold before
-    " jumping to any lines contained therein
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
-	    \ "   * we corrected the raw number to a line ID.",
-	    \ "   */",
-	    \ "  if (lineElem) {",
-	    \ "    lineElem.scrollIntoView(true);",
-	    \ "  }",
-	    \ "  return true;",
-	    \ "}",
-	    \ "if ('onhashchange' in window) {",
-	    \ "  window.onhashchange = JumpToLine;",
-	    \ "}"
-	    \ ])
-
-      if s:settings.dynamic_folds
+      " insert script closing tag if needed
+      if s:uses_script
 	call append(style_start, [
-	      \ "",
-	      \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
-	      \ "  var node = lineElem;",
-	      \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
-	      \ "  {",
-	      \ "    if (node.className == 'closed-fold')",
-	      \ "    {",
-	      \ "      /* toggle open the fold ID (remove window ID) */",
-	      \ "      toggleFold(node.id.substr(4));",
-	      \ "    }",
-	      \ "    node = node.parentNode;",
-	      \ "  }",
+	      \ '',
+	      \ s:settings.use_xhtml ? '//]]>' : '-->',
+	      \ "</script>"
 	      \ ])
      endif
-    endif

-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "",
-	    \ "/* function to open any folds containing a jumped-to line before jumping to it */",
-	    \ "function JumpToLine()",
-	    \ "{",
-	    \ "  var lineNum;",
-	    \ "  lineNum = window.location.hash;",
-	    \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
-	    \ "",
-	    \ "  if (lineNum.indexOf('L') == -1) {",
-	    \ "    lineNum = 'L'+lineNum;",
-	    \ "  }",
-	    \ "  if (lineNum.indexOf('W') == -1) {",
-	    \ "    lineNum = 'W1'+lineNum;",
-	    \ "  }",
-	    \ "  var lineElem = document.getElementById(lineNum);"
-	    \ ])
-    endif
+      " insert javascript to get IDs from line numbers, and to open a fold before
+      " jumping to any lines contained therein
+      if s:settings.line_ids
+	call append(style_start, [
+	      \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
+	      \ "   * we corrected the raw number to a line ID.",
+	      \ "   */",
+	      \ "  if (lineElem) {",
+	      \ "    lineElem.scrollIntoView(true);",
+	      \ "  }",
+	      \ "  return true;",
+	      \ "}",
+	      \ "if ('onhashchange' in window) {",
+	      \ "  window.onhashchange = JumpToLine;",
+	      \ "}"
+	      \ ])

-    " Insert javascript to toggle matching folds open and closed in all windows,
-    " if dynamic folding is active.
-    if s:settings.dynamic_folds
-      call append(style_start, [
-	    \  "  function toggleFold(objID)",
-	    \  "  {",
-	    \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
-	    \  "    {",
-	    \  "      var fold;",
-	    \  '      fold = document.getElementById("win"+win_num+objID);',
-	    \  "      if(fold.className == 'closed-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'open-fold';",
-	    \  "      }",
-	    \  "      else if (fold.className == 'open-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'closed-fold';",
-	    \  "      }",
-	    \  "    }",
-	    \  "  }",
-	    \ ])
-    endif
+	if s:settings.dynamic_folds
+	  call append(style_start, [
+		\ "",
+		\ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
+		\ "  var node = lineElem;",
+		\ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+		\ "  {",
+		\ "    if (node.className == 'closed-fold')",
+		\ "    {",
+		\ "      /* toggle open the fold ID (remove window ID) */",
+		\ "      toggleFold(node.id.substr(4));",
+		\ "    }",
+		\ "    node = node.parentNode;",
+		\ "  }",
+		\ ])
+	endif
+      endif

-    if s:uses_script
-      " insert script tag if needed
-      call append(style_start, [
-	    \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
-	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
-    endif
+      if s:settings.line_ids
+	call append(style_start, [
+	      \ "",
+	      \ "/* function to open any folds containing a jumped-to line before jumping to it */",
+	      \ "function JumpToLine()",
+	      \ "{",
+	      \ "  var lineNum;",
+	      \ "  lineNum = window.location.hash;",
+	      \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
+	      \ "",
+	      \ "  if (lineNum.indexOf('L') == -1) {",
+	      \ "    lineNum = 'L'+lineNum;",
+	      \ "  }",
+	      \ "  if (lineNum.indexOf('W') == -1) {",
+	      \ "    lineNum = 'W1'+lineNum;",
+	      \ "  }",
+	      \ "  var lineElem = document.getElementById(lineNum);"
+	      \ ])
+      endif

-    " Insert styles from all the generated html documents and additional styles
-    " for the table-based layout of the side-by-side diff. The diff should take
-    " up the full browser window (but not more), and be static in size,
-    " horizontally scrollable when the lines are too long. Otherwise, the diff
-    " is pretty useless for really long lines. {{{
-    if s:settings.use_css
-      call append(style_start,
-	    \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
-	    \ style+
-	    \ [ s:settings.use_xhtml ? '' : '<!--',
-	    \   'table { table-layout: fixed; }',
-	    \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
-	    \   'table, td, th { border: 1px solid; }',
-	    \   'td { vertical-align: top; }',
-	    \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
-	    \   'td div { overflow: auto; }',
-	    \   s:settings.use_xhtml ? '' : '-->',
-	    \   '</style>'
-	    \])
-    endif "}}}
+      " Insert javascript to toggle matching folds open and closed in all windows,
+      " if dynamic folding is active.
+      if s:settings.dynamic_folds
+	call append(style_start, [
+	      \  "  function toggleFold(objID)",
+	      \  "  {",
+	      \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
+	      \  "    {",
+	      \  "      var fold;",
+	      \  '      fold = document.getElementById("win"+win_num+objID);',
+	      \  "      if(fold.className == 'closed-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'open-fold';",
+	      \  "      }",
+	      \  "      else if (fold.className == 'open-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'closed-fold';",
+	      \  "      }",
+	      \  "    }",
+	      \  "  }",
+	      \ ])
+      endif
+
+      if s:uses_script
+	" insert script tag if needed
+	call append(style_start, [
+	      \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
+	      \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
+      endif
+
+      " Insert styles from all the generated html documents and additional styles
+      " for the table-based layout of the side-by-side diff. The diff should take
+      " up the full browser window (but not more), and be static in size,
+      " horizontally scrollable when the lines are too long. Otherwise, the diff
+      " is pretty useless for really long lines. {{{
+      if s:settings.use_css
+	call append(style_start,
+	      \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
+	      \ style+
+	      \ [ s:settings.use_xhtml ? '' : '<!--',
+	      \   'table { table-layout: fixed; }',
+	      \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
+	      \   'table, td, th { border: 1px solid; }',
+	      \   'td { vertical-align: top; }',
+	      \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
+	      \   'td div { overflow: auto; }',
+	      \   s:settings.use_xhtml ? '' : '-->',
+	      \   '</style>'
+	      \])
+      endif "}}}
+    endif
  endif

  let &paste = s:old_paste
@@ -712,6 +732,9 @@ func! tohtml#GetUserSettings() "{{{
    call tohtml#GetOption(user_settings,     'no_foldcolumn', user_settings.ignore_folding)
    call tohtml#GetOption(user_settings,      'hover_unfold', 0 )
    call tohtml#GetOption(user_settings,            'no_pre', 0 )
+    call tohtml#GetOption(user_settings,            'no_doc', 0 )
+    call tohtml#GetOption(user_settings,          'no_links', 0 )
+    call tohtml#GetOption(user_settings,       'no_modeline', 0 )
    call tohtml#GetOption(user_settings,        'no_invalid', 0 )
    call tohtml#GetOption(user_settings,      'whole_filler', 0 )
    call tohtml#GetOption(user_settings,         'use_xhtml', 0 )
@@ -752,7 +775,7 @@ func! tohtml#GetUserSettings() "{{{

    " pre_wrap doesn't do anything if not using pre or not using CSS
    if user_settings.no_pre || !user_settings.use_css
-      let user_settings.pre_wrap=0
+      let user_settings.pre_wrap = 0
    endif
    "}}}

--- a/runtime/autoload/typeset.vim
+++ b/runtime/autoload/typeset.vim
@@ -0,0 +1,233 @@
+vim9script
+
+# Language:           Generic TeX typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Latest Revision:    2022 Aug 12
+
+# Constants and helpers {{{
+const SLASH = !exists("+shellslash") || &shellslash ? '/' : '\'
+
+def Echo(msg: string, mode: string, label: string)
+  redraw
+  echo "\r"
+  execute 'echohl' mode
+  echomsg printf('[%s] %s', label, msg)
+  echohl None
+enddef
+
+def EchoMsg(msg: string, label = 'Notice')
+  Echo(msg, 'ModeMsg', label)
+enddef
+
+def EchoWarn(msg: string, label = 'Warning')
+  Echo(msg, 'WarningMsg', label)
+enddef
+
+def EchoErr(msg: string, label = 'Error')
+  Echo(msg, 'ErrorMsg', label)
+enddef
+# }}}
+
+# Track jobs {{{
+var running_jobs = {} # Dictionary of job IDs of jobs currently executing
+
+def AddJob(label: string, j: job)
+  if !has_key(running_jobs, label)
+    running_jobs[label] = []
+  endif
+
+  add(running_jobs[label], j)
+enddef
+
+def RemoveJob(label: string, j: job)
+  if has_key(running_jobs, label) && index(running_jobs[label], j) != -1
+    remove(running_jobs[label], index(running_jobs[label], j))
+  endif
+enddef
+
+def GetRunningJobs(label: string): list<job>
+  return has_key(running_jobs, label) ? running_jobs[label] : []
+enddef
+# }}}
+
+# Callbacks {{{
+def ProcessOutput(qfid: number, wd: string, efm: string, ch: channel, msg: string)
+  # Make sure the quickfix list still exists
+  if getqflist({'id': qfid}).id != qfid
+    EchoErr("Quickfix list not found, stopping the job")
+    call job_stop(ch_getjob(ch))
+    return
+  endif
+
+  # Make sure the working directory is correct
+  silent execute "lcd" wd
+  setqflist([], 'a', {'id': qfid, 'lines': [msg], 'efm': efm})
+  silent lcd -
+enddef
+
+def CloseCb(ch: channel)
+  job_status(ch_getjob(ch)) # Trigger exit_cb's callback
+enddef
+
+def ExitCb(label: string, jobid: job, exitStatus: number)
+  RemoveJob(label, jobid)
+
+  if exitStatus == 0
+    botright cwindow
+    EchoMsg('Success!', label)
+  elseif exitStatus < 0
+    EchoWarn('Job terminated', label)
+  else
+    botright copen
+    wincmd p
+    EchoWarn('There are errors.', label)
+  endif
+enddef
+# }}}
+
+# Create a new empty quickfix list at the end of the stack and return its id {{{
+def NewQuickfixList(path: string): number
+  if setqflist([], ' ', {'nr': '$', 'title': path}) == -1
+    return -1
+  endif
+
+  return getqflist({'nr': '$', 'id': 0}).id
+enddef
+# }}}
+
+# Public interface {{{
+# When a TeX document is split into several source files, each source file
+# may contain a "magic line" specifiying the "root" file, e.g.:
+#
+#   % !TEX root = main.tex
+#
+# Using this line, Vim can know which file to typeset even if the current
+# buffer is different from main.tex.
+#
+# This function searches for the magic line in the first ten lines of the
+# given buffer, and returns the full path of the root document.
+#
+# NOTE: the value of "% !TEX root" *must* be a relative path.
+export def FindRootDocument(bufname: string = bufname("%")): string
+  const bufnr = bufnr(bufname)
+
+  if !bufexists(bufnr)
+    return bufname
+  endif
+
+  var rootpath = fnamemodify(bufname(bufnr), ':p')
+
+  # Search for magic line `% !TEX root = ...` in the first ten lines
+  const header = getbufline(bufnr, 1, 10)
+  const idx = match(header, '^\s*%\s\+!TEX\s\+root\s*=\s*\S')
+  if idx > -1
+    const main = matchstr(header[idx], '!TEX\s\+root\s*=\s*\zs.*$')
+    rootpath = simplify(fnamemodify(rootpath, ":h") .. SLASH .. main)
+  endif
+
+  return rootpath
+enddef
+
+export def LogPath(bufname: string): string
+  const logfile = FindRootDocument(bufname)
+  return fnamemodify(logfile, ":r") .. ".log"
+enddef
+
+# Typeset the specified path
+#
+# Parameters:
+#   label: a descriptive string used in messages to identify the kind of job
+#   Cmd:   a function that takes the path of a document and returns the typesetting command
+#   path:  the path of the document to be typeset. To avoid ambiguities, pass a *full* path.
+#   efm:   the error format string to parse the output of the command.
+#   env:   environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def Typeset(
+  label: string,
+  Cmd:   func(string): list<string>,
+  path:  string,
+  efm:   string,
+  env:   dict<string> = {}
+): bool
+  var fp   = fnamemodify(path, ":p")
+  var wd   = fnamemodify(fp, ":h")
+  var qfid = NewQuickfixList(fp)
+
+  if qfid == -1
+    EchoErr('Could not create quickfix list', label)
+    return false
+  endif
+
+  if !filereadable(fp)
+    EchoErr(printf('File not readable: %s', fp), label)
+    return false
+  endif
+
+  var jobid = job_start(Cmd(path), {
+    env: env,
+    cwd: wd,
+    in_io: "null",
+    callback: (c, m) => ProcessOutput(qfid, wd, efm, c, m),
+    close_cb: CloseCb,
+    exit_cb: (j, e) => ExitCb(label, j, e),
+    })
+
+  if job_status(jobid) ==# "fail"
+    EchoErr("Failed to start job", label)
+    return false
+  endif
+
+  AddJob(label, jobid)
+
+  EchoMsg('Typesetting...', label)
+
+  return true
+enddef
+
+export def JobStatus(label: string)
+  EchoMsg('Jobs still running: ' .. string(len(GetRunningJobs(label))), label)
+enddef
+
+export def StopJobs(label: string)
+  for job in GetRunningJobs(label)
+    job_stop(job)
+  endfor
+
+  EchoMsg('Done.', label)
+enddef
+
+# Typeset the specified buffer
+#
+# Parameters:
+#   name:    a buffer's name. this may be empty to indicate the current buffer.
+#   cmd:     a function that takes the path of a document and returns the typesetting command
+#   label:   a descriptive string used in messages to identify the kind of job
+#   env:     environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def TypesetBuffer(
+  name: string,
+  Cmd: func(string): list<string>,
+  env = {},
+  label = 'Typeset'
+): bool
+  const bufname = bufname(name)
+
+  if empty(bufname)
+    EchoErr('Please save the buffer first.', label)
+    return false
+  endif
+
+  const efm = getbufvar(bufnr(bufname), "&efm")
+  const rootpath = FindRootDocument(bufname)
+
+  return Typeset('ConTeXt', Cmd, rootpath, efm, env)
+enddef
+# }}}
+
+# vim: sw=2 fdm=marker
--- a/runtime/autoload/zig/fmt.vim
+++ b/runtime/autoload/zig/fmt.vim
@@ -0,0 +1,100 @@
+" Adapted from fatih/vim-go: autoload/go/fmt.vim
+"
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" Upstream: https://github.com/ziglang/zig.vim
+
+function! zig#fmt#Format() abort
+  " Save cursor position and many other things.
+  let view = winsaveview()
+
+  if !executable('zig')
+    echohl Error | echomsg "no zig binary found in PATH" | echohl None
+    return
+  endif
+
+  let cmdline = 'zig fmt --stdin --ast-check'
+  let current_buf = bufnr('')
+
+  " The formatted code is output on stdout, the errors go on stderr.
+  if exists('*systemlist')
+    silent let out = systemlist(cmdline, current_buf)
+  else
+    silent let out = split(system(cmdline, current_buf))
+  endif
+  if len(out) == 1
+    if out[0] == "error: unrecognized parameter: '--ast-check'"
+      let cmdline = 'zig fmt --stdin'
+      if exists('*systemlist')
+        silent let out = systemlist(cmdline, current_buf)
+      else
+        silent let out = split(system(cmdline, current_buf))
+      endif
+    endif
+  endif
+  let err = v:shell_error
+
+
+  if err == 0
+    " remove undo point caused via BufWritePre.
+    try | silent undojoin | catch | endtry
+
+    " Replace the file content with the formatted version.
+    if exists('*deletebufline')
+      call deletebufline(current_buf, len(out), line('$'))
+    else
+      silent execute ':' . len(out) . ',' . line('$') . ' delete _'
+    endif
+    call setline(1, out)
+
+    " No errors detected, close the loclist.
+    call setloclist(0, [], 'r')
+    lclose
+  elseif get(g:, 'zig_fmt_parse_errors', 1)
+    let errors = s:parse_errors(expand('%'), out)
+
+    call setloclist(0, [], 'r', {
+        \ 'title': 'Errors',
+        \ 'items': errors,
+        \ })
+
+    let max_win_height = get(g:, 'zig_fmt_max_window_height', 5)
+    " Prevent the loclist from becoming too long.
+    let win_height = min([max_win_height, len(errors)])
+    " Open the loclist, but only if there's at least one error to show.
+    execute 'silent! lwindow ' . win_height
+  endif
+
+  call winrestview(view)
+
+  if err != 0
+    echohl Error | echomsg "zig fmt returned error" | echohl None
+    return
+  endif
+
+  " Run the syntax highlighter on the updated content and recompute the folds if
+  " needed.
+  syntax sync fromstart
+endfunction
+
+" parse_errors parses the given errors and returns a list of parsed errors
+function! s:parse_errors(filename, lines) abort
+  " list of errors to be put into location list
+  let errors = []
+  for line in a:lines
+    let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
+    if !empty(tokens)
+      call add(errors,{
+            \"filename": a:filename,
+            \"lnum":     tokens[2],
+            \"col":      tokens[3],
+            \"text":     tokens[4],
+            \ })
+    endif
+  endfor
+
+  return errors
+endfunction
+" vim: sw=2 ts=2 et
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Nov 08, 2021
-" Version:	32
+" Date:		Mar 12, 2023
+" Version:	33
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2019 Charles E. Campbell {{{1
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_zip")
 finish
 endif
-let g:loaded_zip= "v32"
+let g:loaded_zip= "v33"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of zip needs vim 7.2 or later"
@@ -160,10 +160,14 @@ endfun
 " ---------------------------------------------------------------------
 " ZipBrowseSelect: {{{2
 fun! s:ZipBrowseSelect()
-"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
+  "  call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> curfile<".expand("%").">")
  let repkeep= &report
  set report=10
  let fname= getline(".")
+  if !exists("b:zipfile")
+"   call Dret("ZipBrowseSelect : b:zipfile doesn't exist!")
+   return
+  endif

  " sanity check
  if fname =~ '^"'
--- a/runtime/colors/blue.vim
+++ b/runtime/colors/blue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:16:14 MSK
+" Last Updated: Fri 02 Sep 2022 09:41:44 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,12 +13,12 @@ set background=dark
 hi clear
 let g:colors_name = 'blue'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#870000', '#006400', '#878700', '#000087', '#870087', '#008787', '#bcbcbc', '#878787', '#d70000', '#00ff00', '#ffdf00', '#5fafff', '#d787d7', '#5fffff', '#ffffff']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
-hi Normal guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
+hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
 hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
@@ -27,9 +27,9 @@ hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE
 hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi CursorIM guifg=#000000 guibg=#ffdf00 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffdf00 guibg=#005faf gui=bold cterm=NONE
-hi EndOfBuffer guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
+hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE
+hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
 hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
@@ -43,7 +43,7 @@ hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ffdf00 guibg=#000000 gui=reverse cterm=reverse
+hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse
 hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
 hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline
@@ -57,8 +57,8 @@ hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NO
 hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE
+hi WarningMsg guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE
 hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
 hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
 hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
@@ -73,7 +73,7 @@ hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
 hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
 hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE
+hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link Debug Special
 hi! link diffAdded String
@@ -120,6 +120,8 @@ hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
 hi! link Terminal Normal
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -165,7 +167,7 @@ if s:t_Co >= 256
  hi VertSplit ctermfg=30 ctermbg=NONE cterm=NONE
  hi Visual ctermfg=231 ctermbg=30 cterm=NONE
  hi VisualNOS ctermfg=30 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=160 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=176 ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
  hi debugBreakpoint ctermfg=46 ctermbg=18 cterm=reverse
  hi debugPC ctermfg=87 ctermbg=18 cterm=reverse
@@ -228,6 +230,8 @@ if s:t_Co >= 256
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -276,7 +280,7 @@ if s:t_Co >= 16
  hi VertSplit ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi Visual ctermfg=white ctermbg=darkcyan cterm=NONE
  hi VisualNOS ctermfg=darkcyan ctermbg=white cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=darkblue ctermbg=yellow cterm=NONE
  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
@@ -339,6 +343,8 @@ if s:t_Co >= 16
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -449,6 +455,8 @@ if s:t_Co >= 8
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -526,6 +534,22 @@ if s:t_Co >= 0
 endif

 " Background: dark
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
 " Color: black         #000000           16                black
 " Color: darkred       #870000           88                darkred
 " Color: darkyellow    #878700           100               darkyellow
@@ -537,7 +561,7 @@ endif
 " Color: darkgray      #878787           102               darkgray
 " Color: red           #d70000           160               red
 " Color: green         #00ff00           46                green
-" Color: yellow        #ffdf00           220               yellow
+" Color: yellow        #ffd700           220               yellow
 " Color: blue          #005faf           25                blue
 " Color: magenta       #d787d7           176               magenta
 " Color: cyan          #5fffff           87                cyan
@@ -549,8 +573,8 @@ endif
 " Color: coral         #ff7f50           209               red
 " Color: olivedrab     #6b8e23           64                green
 " Color: slateblue     #6a5acd           62                darkmagenta
-" Term colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan gray
-" Term colors: darkgray red green yellow xtermblue magenta cyan white
+" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- a/runtime/colors/darkblue.vim
+++ b/runtime/colors/darkblue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 14:37:41 MSK
+" Last Updated: Fri 02 Sep 2022 09:40:36 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'darkblue'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
@@ -65,6 +65,8 @@ hi! link diffCommon WarningMsg
 hi! link diffBDiffer WarningMsg
 hi! link lCursor Cursor
 hi! link CurSearch Search
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
 hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
@@ -171,6 +173,8 @@ if s:t_Co >= 256
  hi! link diffBDiffer WarningMsg
  hi! link lCursor Cursor
  hi! link CurSearch Search
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
--- a/runtime/colors/delek.vim
+++ b/runtime/colors/delek.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:50:30 2022
+" Last Updated: Sun 04 Sep 2022 09:31:26 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'delek'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
@@ -25,6 +25,8 @@ hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link ErrorMsg Error
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=bold
@@ -57,7 +59,7 @@ hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi WarningMsg guifg=#cd00cd guibg=#ffffff gui=NONE cterm=NONE
 hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
 hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi Question guifg=#00cd00 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#008700 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffffff guibg=#ff1493 gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#cd00cd gui=NONE cterm=NONE
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
  hi! link ErrorMsg Error
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi EndOfBuffer ctermfg=250 ctermbg=NONE cterm=NONE
  hi StatusLine ctermfg=226 ctermbg=18 cterm=bold
@@ -129,7 +133,7 @@ if s:t_Co >= 256
  hi WarningMsg ctermfg=164 ctermbg=231 cterm=NONE
  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi Question ctermfg=40 ctermbg=NONE cterm=bold
+  hi Question ctermfg=28 ctermbg=NONE cterm=bold
  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
  hi MatchParen ctermfg=231 ctermbg=198 cterm=NONE
  hi Search ctermfg=231 ctermbg=164 cterm=NONE
--- a/runtime/colors/desert.vim
+++ b/runtime/colors/desert.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:51:36 2022
+" Last Updated: Fri 02 Sep 2022 09:39:21 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'desert'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
@@ -25,6 +25,8 @@ hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
 hi StatusLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
 hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
@@ -40,7 +42,7 @@ hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
 hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold
-hi NonText guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#6dceeb guibg=#4d4d4d gui=NONE cterm=NONE
 hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE
 hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
 hi Visual guifg=#f0e68c guibg=#6b8e24 gui=NONE cterm=NONE
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
  hi! link EndOfBuffer NonText
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
  hi StatusLine ctermfg=236 ctermbg=144 cterm=NONE
  hi StatusLineNC ctermfg=242 ctermbg=144 cterm=NONE
@@ -112,7 +116,7 @@ if s:t_Co >= 256
  hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
  hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE
  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold
-  hi NonText ctermfg=81 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=81 ctermbg=239 cterm=NONE
  hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE
  hi Folded ctermfg=226 ctermbg=239 cterm=NONE
  hi Visual ctermfg=186 ctermbg=64 cterm=NONE
--- a/runtime/colors/elflord.vim
+++ b/runtime/colors/elflord.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:48:00 2022
+" Last Updated: Fri 02 Sep 2022 09:44:22 MSK

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'elflord'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -43,6 +43,8 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/evening.vim
+++ b/runtime/colors/evening.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:52:56 2022
+" Last Updated: Sun 04 Sep 2022 09:48:34 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,10 +13,10 @@ set background=dark
 hi clear
 let g:colors_name = 'evening'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#ffa500', '#2e8b57', '#ffff00', '#006faf', '#8b008b', '#008b8b', '#bebebe', '#4d4d4d', '#ff5f5f', '#00ff00', '#ffff60', '#0087ff', '#ff80ff', '#00ffff', '#ffffff']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
 hi! link VertSplit StatusLineNC
 hi! link StatusLineTerm StatusLine
@@ -64,6 +64,8 @@ hi! link String Constant
 hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
@@ -98,7 +100,7 @@ hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
-hi WarningMsg guifg=#8b0000 guibg=NONE gui=NONE cterm=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
 hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
 hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
@@ -170,6 +172,8 @@ if s:t_Co >= 256
  hi! link Structure Type
  hi! link Tag Special
  hi! link Typedef Type
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
@@ -204,7 +208,7 @@ if s:t_Co >= 256
  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
@@ -279,6 +283,8 @@ if s:t_Co >= 16
  hi! link Structure Type
  hi! link Tag Special
  hi! link Typedef Type
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=white ctermbg=black cterm=NONE
  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -313,7 +319,7 @@ if s:t_Co >= 16
  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
  hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
  hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
@@ -494,13 +500,26 @@ endif
 " Color: grey30        #4d4d4d           239               darkgray
 " Color: grey40        #666666           241               darkgray
 " Color: grey60        #999999           246               darkgray
-" Color: xtermblue     #0087ff           33                blue
-" Color: xtermdarkblue #006faf           25                darkblue
-" Color: xtermred      #ff5f5f           203               red
 " Color: comment       #80a0ff           111               lightblue
 " Color: darkred       #8b0000           88                darkred
-" Term colors: black orange seagreen yellow xtermdarkblue darkmagenta darkcyan grey
-" Term colors: grey30 xtermred green lightyellow xtermblue magenta cyan white
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue_m  #0087ff           33                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
+" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue_m x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -0,0 +1,468 @@
+" Name:         habamax
+" Description:  Hubba hubba hubba.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: Fri 24 Mar 2023 20:28:06 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'habamax'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc']
+endif
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi! link javaScriptFunction Statement
+hi! link javaScriptIdentifier Statement
+hi! link sqlKeyword Statement
+hi! link yamlBlockMappingKey Statement
+hi! link rubyMacro Statement
+hi! link rubyDefine Statement
+hi! link vimVar Normal
+hi! link vimOper Normal
+hi! link vimSep Normal
+hi! link vimParenSep Normal
+hi! link vimCommentString Comment
+hi! link gitCommitSummary Title
+hi! link markdownUrl String
+hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
+hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
+hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi TabLineSel guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi ToolbarButton guifg=#9e9e9e guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffaf5f guibg=NONE gui=bold cterm=bold
+hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
+hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
+hi Pmenu guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi PmenuKind guifg=#d7875f guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuKindSel guifg=#d75f5f guibg=#afaf87 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#767676 guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuExtraSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
+hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
+hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse
+hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE
+hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
+hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
+hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f gui=NONE cterm=NONE
+hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
+hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
+hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
+hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
+hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+hi Title guifg=#d7d787 guibg=NONE gui=bold cterm=bold
+hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
+hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
+hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
+hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
+hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
+
+if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi! link javaScriptFunction Statement
+  hi! link javaScriptIdentifier Statement
+  hi! link sqlKeyword Statement
+  hi! link yamlBlockMappingKey Statement
+  hi! link rubyMacro Statement
+  hi! link rubyDefine Statement
+  hi! link vimVar Normal
+  hi! link vimOper Normal
+  hi! link vimSep Normal
+  hi! link vimParenSep Normal
+  hi! link vimCommentString Comment
+  hi! link gitCommitSummary Title
+  hi! link markdownUrl String
+  hi Normal ctermfg=250 ctermbg=234 cterm=NONE
+  hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
+  hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE
+  hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+  hi TabLine ctermfg=234 ctermbg=243 cterm=NONE
+  hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=247 ctermbg=234 cterm=bold,reverse
+  hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE
+  hi CursorLineNr ctermfg=215 ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+  hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE
+  hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+  hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=237 cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=234 ctermbg=144 cterm=NONE
+  hi PmenuKind ctermfg=173 ctermbg=237 cterm=NONE
+  hi PmenuKindSel ctermfg=167 ctermbg=144 cterm=NONE
+  hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
+  hi PmenuExtraSel ctermfg=234 ctermbg=144 cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=167 ctermbg=234 cterm=reverse
+  hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse
+  hi ModeMsg ctermfg=234 ctermbg=186 cterm=NONE
+  hi MoreMsg ctermfg=108 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=144 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=186 ctermbg=234 cterm=reverse
+  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+  hi Search ctermfg=234 ctermbg=108 cterm=NONE
+  hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE
+  hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE
+  hi WildMenu ctermfg=234 ctermbg=186 cterm=NONE
+  hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
+  hi debugBreakpoint ctermfg=234 ctermbg=173 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+  hi Folded ctermfg=247 ctermbg=235 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE
+  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=67 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=108 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=182 ctermbg=NONE cterm=underline
+  hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=173 ctermbg=NONE cterm=NONE
+  hi String ctermfg=108 ctermbg=NONE cterm=NONE
+  hi Character ctermfg=151 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=139 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=144 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=66 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=186 ctermbg=NONE cterm=bold
+  hi Directory ctermfg=109 ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
+  hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
+  hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi Statusline ctermfg=black ctermbg=gray cterm=NONE
+  hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE
+  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi CursorLineNr ctermfg=red ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=cyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=red cterm=NONE
+  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Character ctermfg=green ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
+  hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
+  hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold
+  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ModeMsg ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
+  hi SpellCap ctermfg=blue ctermbg=gray cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
+  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse
+  hi DiffChange ctermfg=black ctermbg=white cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: color00          #1C1C1C        234            black
+" Color: color08          #767676        243            darkgray
+" Color: color01          #D75F5F        167            darkred
+" Color: color09          #D7875F        173            red
+" Color: color02          #87AF87        108            darkgreen
+" Color: color10          #AFD7AF        151            green
+" Color: color03          #AFAF87        144            darkyellow
+" Color: color11          #D7D787        186            yellow
+" Color: color04          #5F87AF        67             blue
+" Color: color12          #87AFD7        110            blue
+" Color: color05          #AF87AF        139            darkmagenta
+" Color: color13          #D7AFD7        182            magenta
+" Color: color06          #5F8787        66             darkcyan
+" Color: color14          #87AFAF        109            cyan
+" Color: color07          #9E9E9E        247            gray
+" Color: color15          #BCBCBC        250            white
+" Color: colorLine        #303030        236            darkgrey
+" Color: colorB           #3a3a3a        237            darkgrey
+" Color: colorF           #262626        235            darkgrey
+" Color: colorNonT        #585858        240            darkgrey
+" Color: colorC           #FFAF5F        215            red
+" Color: colorlC          #5FFF00        82             green
+" Color: colorV           #1F3F5F        109            cyan
+" Color: colorMP          #ff00af        199            magenta
+" Color: diffAdd          #5f875f        65             darkgreen
+" Color: diffDelete       #af875f        137            darkyellow
+" Color: diffChange       #5f5f5f        59             darkgray
+" Color: diffText         #878787        102            lightgrey
+" Color: black            #000000        16             black
+" Color: white            #dadada        253            white
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" vim: et ts=2 sw=2
--- a/runtime/colors/industry.vim
+++ b/runtime/colors/industry.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Shian Lee.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:53:58 2022
+" Last Updated: Sun 04 Sep 2022 09:50:04 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'industry'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
@@ -51,7 +51,7 @@ hi Underlined guifg=#87afff guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#870000 guibg=NONE gui=bold cterm=bold
+hi WarningMsg guifg=#ff0000 guibg=NONE gui=bold cterm=bold
 hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=bold
 hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#005fff guibg=#ffff00 gui=NONE cterm=NONE
@@ -84,6 +84,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -123,7 +125,7 @@ if s:t_Co >= 256
  hi Error ctermfg=231 ctermbg=196 cterm=NONE
  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=bold
  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=bold
  hi Question ctermfg=46 ctermbg=NONE cterm=bold
  hi Todo ctermfg=27 ctermbg=226 cterm=NONE
@@ -156,6 +158,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -198,7 +202,7 @@ if s:t_Co >= 16
  hi Error ctermfg=white ctermbg=red cterm=NONE
  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Question ctermfg=green ctermbg=NONE cterm=bold
  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
@@ -231,6 +235,8 @@ if s:t_Co >= 16
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
--- a/runtime/colors/koehler.vim
+++ b/runtime/colors/koehler.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:24:58 MSK
+" Last Updated: Fri 02 Sep 2022 09:23:56 MSK

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'koehler'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -49,6 +49,8 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/lists/default.vim
+++ b/runtime/colors/lists/default.vim
@@ -1,5 +1,5 @@
 " Maintainer:  Drew Vogel <dvogel@sidejump.org>
-" Last Change: 2022 Mar 20
+" Last Change: 2023 Apr 19
 "
 " Replaced rgb.txt as the source of de facto standard color names. This is
 " sourced each time the colorscheme command is run. It is also sourced each
@@ -7,7 +7,8 @@
 " these colors by introducing a new colors/lists/default.vim file earlier in
 " the runtimepath.

-let s:keepcpo= &cpo
+" make sure line continuation works
+let s:keepcpo = &cpo
 set cpo&vim

 call extend(v:colornames, {
@@ -801,7 +802,7 @@ call extend(v:colornames, {
 			\ 'teal': '#008080'
 			\ }, 'keep')

-let &cpo= s:keepcpo
+let &cpo = s:keepcpo
 unlet s:keepcpo

 "vim: sw=4
--- a/runtime/colors/lunaperche.vim
+++ b/runtime/colors/lunaperche.vim
@@ -0,0 +1,955 @@
+" Name:         Perchè il sole a Milano? Portofino? Dimmi la luna perchè?
+" Description:  White(perchè il sole)/Black(la luna perchè?) background colorscheme.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://www.github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)
+" Last Updated: Sun 26 Mar 2023 23:04:18 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'lunaperche'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link helpVim Title
+hi! link helpHeader Title
+hi! link helpHyperTextJump Underlined
+hi! link diffFile PreProc
+hi! link markdownHeadingDelimiter Special
+hi! link markdownUrl String
+hi! link colortemplateKey Statement
+hi! link xmlTagName Statement
+hi! link javaScriptFunction Statement
+hi! link javaScriptIdentifier Statement
+hi! link sqlKeyword Statement
+hi! link yamlBlockMappingKey Statement
+hi! link rubyMacro Statement
+hi! link rubyDefine Statement
+hi! link vimGroup Normal
+hi! link vimVar Normal
+hi! link vimOper Normal
+hi! link vimSep Normal
+hi! link vimParenSep Normal
+hi! link vimOption Normal
+hi! link vimCommentString Comment
+hi! link pythonInclude Statement
+hi! link shQuote Constant
+hi! link shNoQuote Normal
+hi! link shTestOpr Normal
+hi! link shOperator Normal
+hi! link shSetOption Normal
+hi! link shOption Normal
+hi! link shCommandSub Normal
+hi! link shDerefPattern shQuote
+hi! link shDerefOp Special
+hi! link phpStorageClass Statement
+hi! link phpStructure Statement
+hi! link phpInclude Statement
+hi! link phpDefine Statement
+hi! link phpSpecialFunction Normal
+hi! link phpParent Normal
+hi! link phpComparison Normal
+hi! link phpOperator Normal
+hi! link phpVarSelector Special
+hi! link phpMemberSelector Special
+hi! link phpDocCustomTags phpDocTags
+hi! link javaExternal Statement
+hi! link javaType Statement
+hi! link javaScopeDecl Statement
+hi! link javaClassDecl Statement
+hi! link javaStorageClass Statement
+hi! link javaDocParam PreProc
+hi! link csStorage Statement
+hi! link csAccessModifier Statement
+hi! link csClass Statement
+hi! link csModifier Statement
+hi! link csAsyncModifier Statement
+hi! link csLogicSymbols Normal
+hi! link csClassType Normal
+hi! link csType Statement
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link MessageWindow PMenu
+hi! link PopupNotification Todo
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787d7', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#5fafff', '#ff87ff', '#5fd7d7', '#ffffff']
+  endif
+  hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE
+  hi Statusline guifg=#c6c6c6 guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#000000 guibg=#5fafff gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#4e4e4e gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#ff5f5f guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
+  hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse
+  hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
+  hi CurSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold
+  hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE
+  hi MatchParen guifg=#c5e7c5 guibg=#000000 gui=reverse cterm=reverse
+  hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#5fafff guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Statement guifg=#e4e4e4 guibg=NONE gui=bold cterm=bold
+  hi Type guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#5fd7d7 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#5fafff guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE
+  hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
+  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
+  hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi dirType guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionGroup guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionOther guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+  hi dirOwner guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirGroup guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirTime guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi dirSize guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+  hi dirSizeMod guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuDirectorySubtle guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuBookmarkPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuHistoryPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuLineNr guifg=#878787 guibg=NONE gui=NONE cterm=NONE
+  hi CocSearch guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005fd7', '#af00af', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#ffd787', '#0087d7', '#ff00ff', '#008787', '#ffffff']
+  endif
+  hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi Statusline guifg=#ffffff guibg=#000000 gui=bold cterm=bold
+  hi StatuslineNC guifg=#ffffff guibg=#767676 gui=NONE cterm=NONE
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#bcbcbc gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#af0000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ModeMsg guifg=#ffd787 guibg=#000000 gui=reverse cterm=reverse
+  hi MoreMsg guifg=#008700 guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#af00af guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#d70000 guibg=NONE gui=bold cterm=bold
+  hi Todo guifg=#008787 guibg=#ffffff gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
+  hi CurSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold
+  hi debugPC guifg=#005fd7 guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#005f5f guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#005fd7 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#af00af guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Statement guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi Type guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#008787 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#005fd7 guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE
+  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#af00af guibg=NONE gui=NONE cterm=NONE
+  hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionUser guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionGroup guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionOther guifg=#af00af guibg=NONE gui=NONE cterm=NONE
+  hi dirOwner guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirGroup guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirTime guifg=#808080 guibg=NONE gui=NONE cterm=NONE
+  hi dirSize guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
+  hi dirSizeMod guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi dirLink guifg=#008700 guibg=NONE gui=bold cterm=bold
+  hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuDirectorySubtle guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi FilterMenuLineNr guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi CocSearch guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
+endif
+
+if s:t_Co >= 256
+  hi! link helpVim Title
+  hi! link helpHeader Title
+  hi! link helpHyperTextJump Underlined
+  hi! link diffFile PreProc
+  hi! link markdownHeadingDelimiter Special
+  hi! link markdownUrl String
+  hi! link colortemplateKey Statement
+  hi! link xmlTagName Statement
+  hi! link javaScriptFunction Statement
+  hi! link javaScriptIdentifier Statement
+  hi! link sqlKeyword Statement
+  hi! link yamlBlockMappingKey Statement
+  hi! link rubyMacro Statement
+  hi! link rubyDefine Statement
+  hi! link vimGroup Normal
+  hi! link vimVar Normal
+  hi! link vimOper Normal
+  hi! link vimSep Normal
+  hi! link vimParenSep Normal
+  hi! link vimOption Normal
+  hi! link vimCommentString Comment
+  hi! link pythonInclude Statement
+  hi! link shQuote Constant
+  hi! link shNoQuote Normal
+  hi! link shTestOpr Normal
+  hi! link shOperator Normal
+  hi! link shSetOption Normal
+  hi! link shOption Normal
+  hi! link shCommandSub Normal
+  hi! link shDerefPattern shQuote
+  hi! link shDerefOp Special
+  hi! link phpStorageClass Statement
+  hi! link phpStructure Statement
+  hi! link phpInclude Statement
+  hi! link phpDefine Statement
+  hi! link phpSpecialFunction Normal
+  hi! link phpParent Normal
+  hi! link phpComparison Normal
+  hi! link phpOperator Normal
+  hi! link phpVarSelector Special
+  hi! link phpMemberSelector Special
+  hi! link phpDocCustomTags phpDocTags
+  hi! link javaExternal Statement
+  hi! link javaType Statement
+  hi! link javaScopeDecl Statement
+  hi! link javaClassDecl Statement
+  hi! link javaStorageClass Statement
+  hi! link javaDocParam PreProc
+  hi! link csStorage Statement
+  hi! link csAccessModifier Statement
+  hi! link csClass Statement
+  hi! link csModifier Statement
+  hi! link csAsyncModifier Statement
+  hi! link csLogicSymbols Normal
+  hi! link csClassType Normal
+  hi! link csType Statement
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link MessageWindow PMenu
+  hi! link PopupNotification Todo
+  if &background ==# 'dark'
+    hi Normal ctermfg=251 ctermbg=16 cterm=NONE
+    hi Statusline ctermfg=251 ctermbg=16 cterm=bold,reverse
+    hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=251 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
+    hi QuickFixLine ctermfg=16 ctermbg=75 cterm=NONE
+    hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=239 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=203 ctermbg=236 cterm=NONE
+    hi PmenuKindSel ctermfg=203 ctermbg=239 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=239 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=203 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
+    hi ModeMsg ctermfg=222 ctermbg=NONE cterm=reverse
+    hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=213 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=116 ctermbg=16 cterm=reverse
+    hi Search ctermfg=16 ctermbg=222 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=77 cterm=NONE
+    hi CurSearch ctermfg=16 ctermbg=77 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=222 cterm=bold
+    hi debugPC ctermfg=67 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=73 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=24 cterm=NONE
+    hi MatchParen ctermfg=30 ctermbg=16 cterm=reverse
+    hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=213 ctermbg=NONE cterm=underline
+    hi Comment ctermfg=75 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=213 ctermbg=NONE cterm=NONE
+    hi String ctermfg=222 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=254 ctermbg=NONE cterm=bold
+    hi Type ctermfg=77 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=116 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=73 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=75 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE
+    hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
+    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
+    hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=213 ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=176 ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=137 ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=73 ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=243 ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=222 ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=176 ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=102 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuBookmarkPath ctermfg=102 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=102 ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CocSearch ctermfg=222 ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=16 ctermbg=231 cterm=NONE
+    hi Statusline ctermfg=231 ctermbg=16 cterm=bold
+    hi StatuslineNC ctermfg=231 ctermbg=243 cterm=NONE
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=250 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold,reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
+    hi QuickFixLine ctermfg=231 ctermbg=32 cterm=NONE
+    hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=247 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=247 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=251 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=124 ctermbg=254 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=251 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=254 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=251 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=160 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+    hi ModeMsg ctermfg=222 ctermbg=16 cterm=reverse
+    hi MoreMsg ctermfg=28 ctermbg=NONE cterm=bold
+    hi Question ctermfg=127 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=160 ctermbg=NONE cterm=bold
+    hi Todo ctermfg=30 ctermbg=231 cterm=reverse
+    hi Search ctermfg=16 ctermbg=222 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=114 cterm=NONE
+    hi CurSearch ctermfg=16 ctermbg=114 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=222 cterm=bold
+    hi debugPC ctermfg=26 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=23 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=67 cterm=NONE
+    hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
+    hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=254 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=133 ctermbg=NONE cterm=underline
+    hi Comment ctermfg=26 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=127 ctermbg=NONE cterm=NONE
+    hi String ctermfg=130 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=16 ctermbg=NONE cterm=bold
+    hi Type ctermfg=28 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=30 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=26 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE
+    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
+    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
+    hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=127 ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=23 ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=130 ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=28 ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=127 ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=244 ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=124 ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=23 ctermbg=NONE cterm=NONE
+    hi dirLink ctermfg=28 ctermbg=NONE cterm=bold
+    hi dirFilterMenuBookmarkPath ctermfg=241 ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=241 ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=241 ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=241 ctermbg=NONE cterm=NONE
+    hi CocSearch ctermfg=124 ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
+    hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+    hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=yellow ctermbg=NONE cterm=reverse
+    hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
+    hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=cyan ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=yellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=green cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=green cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+    hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=grey ctermbg=NONE cterm=bold
+    hi Type ctermfg=green ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=grey ctermbg=NONE cterm=NONE
+    hi dirFilterMenuBookmarkPath ctermfg=grey ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=grey ctermbg=NONE cterm=NONE
+    hi CocSearch ctermfg=yellow ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=white cterm=NONE
+    hi Statusline ctermfg=white ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=white ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=bold,reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
+    hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=yellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
+    hi Todo ctermfg=cyan ctermbg=white cterm=reverse
+    hi Search ctermfg=black ctermbg=yellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=green cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=green cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=cyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=black ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=cyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi dirPermissionGroup ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi dirOwner ctermfg=grey ctermbg=NONE cterm=NONE
+    hi dirGroup ctermfg=grey ctermbg=NONE cterm=NONE
+    hi dirTime ctermfg=grey ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi dirLink ctermfg=darkgreen ctermbg=NONE cterm=bold
+    hi dirFilterMenuBookmarkPath ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi dirFilterMenuHistoryPath ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FilterMenuDirectorySubtle ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FilterMenuLineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi CocSearch ctermfg=darkred ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE
+    hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE
+    hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi Search ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi CurSearch ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=grey ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=grey cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=black ctermbg=black cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
+    hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi CurSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi MatchParen ctermfg=darkcyan ctermbg=grey cterm=reverse
+    hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline
+    hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=black ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=black ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: any
+" Background: dark
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #AF5F5F        131            darkred
+" Color: color09                 #FF5F5F        203            red
+" Color: color02                 #5FAF5F        71             darkgreen
+" Color: color10                 #5FD75F        77             green
+" Color: color03                 #AF875F        137            darkyellow
+" Color: color11                 #FFD787        222            yellow
+" Color: color04                 #5F87AF        67             darkblue
+" Color: color12                 #5FAFFF        75             blue
+" Color: color05                 #D787D7        176            darkmagenta
+" Color: color13                 #FF87FF        213            magenta
+" Color: color06                 #5FAFAF        73             darkcyan
+" Color: color14                 #5FD7D7        116            cyan
+" Color: color07                 #C6C6C6        251            grey
+" Color: color15                 #FFFFFF        231            white
+" Color: colorDimWhite           #E4E4E4        254            grey
+" Color: colorLine               #262626        235            darkgrey
+" Color: colorB                  #303030        236            darkgrey
+" Color: colorNonT               #585858        240            grey
+" Color: colorTab                #585858        240            grey
+" Color: colorC                  #FFFFFF        231            white
+" Color: colorlC                 #FF5FFF        207            magenta
+" Color: colorV                  #005F87        24             darkblue
+" Color: colorMP                 #C5E7C5        30             darkcyan
+" Color: colorPMenuSel           #4e4e4e        239            darkcyan
+" Color: colorDim                #878787        102            grey
+" Color: diffAdd                 #875f87        96             darkmagenta
+" Color: diffDelete              #D78787        174            darkred
+" Color: diffChange              #5f5f5f        59             darkgreen
+" Color: diffText                #5f8787        66             cyan
+" Color: fgDiffText              #afffff        159            black
+" Color: fgDiff                  #C6C6C6        251            white
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: light
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #AF0000        124            darkred
+" Color: color09                 #D70000        160            red
+" Color: color02                 #008700        28             darkgreen
+" Color: color10                 #87D787        114            green
+" Color: color03                 #AF5F00        130            darkyellow
+" Color: color11                 #FFD787        222            yellow
+" Color: color04                 #005FD7        26             darkblue
+" Color: color12                 #0087D7        32             blue
+" Color: color05                 #AF00AF        127            darkmagenta
+" Color: color13                 #FF00FF        133            magenta
+" Color: color06                 #005F5F        23             darkcyan
+" Color: color14                 #008787        30             cyan
+" Color: color07                 #808080        244            grey
+" Color: color15                 #FFFFFF        231            white
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
+" Color: colorNonT               #9E9E9E        247            darkgrey
+" Color: colorTab                #BCBCBC        250            lightgrey
+" Color: colorC                  #000000        16             black
+" Color: colorlC                 #FF00FF        201            magenta
+" Color: colorV                  #5F87AF        67             darkblue
+" Color: colorMP                 #C5E7C5        30             darkcyan
+" Color: colorPMenuSel           #C6C6C6        251            darkcyan
+" Color: colorDim                #626262        241            darkgrey
+" Color: diffAdd                 #D7AFD7        182            darkmagenta
+" Color: diffDelete              #870000        88             darkred
+" Color: diffChange              #D0D0D0        252            lightgray
+" Color: diffText                #5FD7D7        80             cyan
+" Color: fgDiff                  #000000        16             black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: any
+" vim: et ts=2 sw=2
--- a/runtime/colors/morning.vim
+++ b/runtime/colors/morning.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Bram Moolenaar <Bram@vim.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:55:30 2022
+" Last Updated: Fri 02 Sep 2022 09:46:24 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'morning'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatuslineTerm Statusline
 hi! link StatuslineTermNC StatuslineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
@@ -96,6 +98,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatuslineTerm Statusline
  hi! link StatuslineTermNC StatuslineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=254 cterm=NONE
  hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold
  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
--- a/runtime/colors/murphy.vim
+++ b/runtime/colors/murphy.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:56:21 2022
+" Last Updated: Fri 02 Sep 2022 09:47:20 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'murphy'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=NONE cterm=NONE
 hi StatusLine guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
@@ -96,6 +98,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=120 ctermbg=16 cterm=NONE
  hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
  hi StatusLine ctermfg=231 ctermbg=18 cterm=NONE
--- a/runtime/colors/pablo.vim
+++ b/runtime/colors/pablo.vim
@@ -3,7 +3,7 @@
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:57:11 2022
+" Last Updated: Wed 14 Sep 2022 19:05:27 MSK

 " Generated by Colortemplate v2.2.0

@@ -12,18 +12,20 @@ set background=dark
 hi clear
 let g:colors_name = 'pablo'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
-hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi Comment guifg=#808080 guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#00c0c0 guibg=NONE gui=NONE cterm=NONE
@@ -88,13 +90,15 @@ hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE

 if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
  hi! link Terminal Normal
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
  hi Comment ctermfg=244 ctermbg=NONE cterm=NONE
  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
  hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE
@@ -117,7 +121,7 @@ if s:t_Co >= 256
  hi NonText ctermfg=63 ctermbg=NONE cterm=bold
  hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=bold
  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi WarningMsg ctermfg=224 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
  hi SignColumn ctermfg=51 ctermbg=248 cterm=NONE
  hi ColorColumn ctermfg=NONE ctermbg=239 cterm=NONE
  hi FoldColumn ctermfg=102 ctermbg=236 cterm=NONE
@@ -163,12 +167,6 @@ endif

 if s:t_Co >= 16
  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi! link Terminal Normal
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
@@ -191,7 +189,7 @@ if s:t_Co >= 16
  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
  hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
  hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE
  hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -282,7 +280,6 @@ if s:t_Co >= 8
  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
@@ -405,7 +402,7 @@ endif
 " Color: SpecialKey     #00ffff     81             cyan
 " Color: StatusLineTerm #90ee90     121            darkgreen
 " Color: Title          #ff00ff     225            magenta
-" Color: WarningMsg     #ff0000     224            darkred
+" Color: WarningMsg     #ff0000     196            red
 " Color: ToolbarLine    #7f7f7f     242            darkgrey
 " Color: ToolbarButton  #d3d3d3     254            grey
 " Color: Underlined     #80a0ff     111            darkgreen
--- a/runtime/colors/peachpuff.vim
+++ b/runtime/colors/peachpuff.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:58:17 2022
+" Last Updated: Fri 02 Sep 2022 09:50:02 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'peachpuff'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffdab9 gui=NONE cterm=NONE
 hi Folded guifg=#000000 guibg=#e3c1a5 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
@@ -94,6 +96,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=223 cterm=NONE
  hi Folded ctermfg=16 ctermbg=252 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=180 cterm=NONE
--- a/runtime/colors/quiet.vim
+++ b/runtime/colors/quiet.vim
@@ -0,0 +1,745 @@
+" Name:         quiet
+" Description:  A mostly monochrome colorscheme, with a few niceties.
+" Author:       Maxence Weynans <neutaaaaan@gmail.com>
+" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)`
+" Last Updated: Wed 15 Mar 2023 06:45:06 PM CET
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'quiet'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link Terminal Normal
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Debug Special
+hi! link Delimiter Special
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link String Constant
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link lCursor Cursor
+hi! link debugBreakpoint ModeMsg
+hi! link debugPC CursorLine
+
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+  endif
+  hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE
+  hi DiffAdd guifg=#00af00 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#87afd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d75f5f guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi Folded guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#707070 guibg=#585858 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi PmenuThumb guifg=#dadada guibg=#dadada gui=NONE cterm=NONE
+  hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+  hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#707070 guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
+  hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
+  hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
+  hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi StatusLineNC guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
+  hi TabLine guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
+  hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi TabLineSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#00afff guibg=#000000 gui=bold cterm=bold
+  hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold
+  hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+  endif
+  hi Normal guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#000000 guibg=#eeeeee gui=NONE cterm=NONE
+  hi DiffAdd guifg=#87d787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#afafd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d78787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Directory guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#000000 guibg=#d7d7d7 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
+  hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 gui=bold cterm=bold
+  hi PmenuThumb guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
+  hi Question guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+  hi SignColumn guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#626262 guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
+  hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
+  hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
+  hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline
+  hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
+  hi StatusLineNC guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
+  hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi WarningMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#eeeeee gui=bold cterm=bold
+  hi Comment guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi Constant guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#000000 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#000000 guibg=#d7d7d7 gui=bold cterm=bold
+endif
+
+if s:t_Co >= 256
+  if &background ==# 'dark'
+    hi Normal ctermfg=253 ctermbg=16 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+    hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE
+    hi DiffAdd ctermfg=34 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=110 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=167 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
+    hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=242 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse
+    hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=242 ctermbg=16 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=242 ctermbg=240 cterm=NONE
+    hi PmenuSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold
+    hi PmenuThumb ctermfg=253 ctermbg=253 cterm=NONE
+    hi Question ctermfg=253 ctermbg=NONE cterm=NONE
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
+    hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=242 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=16 cterm=reverse
+    hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=16 ctermbg=253 cterm=bold
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
+    hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=39 ctermbg=16 cterm=bold
+    hi Comment ctermfg=242 ctermbg=NONE cterm=bold
+    hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
+    hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+    hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
+  else
+    " Light background
+    hi Normal ctermfg=16 ctermbg=188 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLineNr ctermfg=16 ctermbg=255 cterm=NONE
+    hi DiffAdd ctermfg=114 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=146 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=174 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
+    hi Directory ctermfg=16 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=241 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=16 ctermbg=188 cterm=reverse
+    hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=241 ctermbg=188 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+    hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
+    hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=16 ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold
+    hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE
+    hi Question ctermfg=16 ctermbg=NONE cterm=NONE
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
+    hi SignColumn ctermfg=16 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=241 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=124 ctermbg=188 cterm=underline
+    hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
+    hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
+    hi SpellRare ctermfg=30 ctermbg=188 cterm=underline
+    hi StatusLine ctermfg=255 ctermbg=16 cterm=bold
+    hi StatusLineNC ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLineFill ctermfg=16 ctermbg=188 cterm=NONE
+    hi TabLineSel ctermfg=255 ctermbg=16 cterm=bold
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
+    hi WarningMsg ctermfg=16 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=255 cterm=bold
+    hi Comment ctermfg=16 ctermbg=NONE cterm=bold
+    hi Constant ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
+    hi Identifier ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=16 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=16 cterm=bold,reverse
+    hi Type ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=16 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=188 cterm=bold
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  else
+    " Light background
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  else
+    " Light background
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: dark0         #000000           16                black
+" Color: dark1         #d7005f           161               darkred
+" Color: dark2         #00af5f           35                darkgreen
+" Color: dark3         #d78700           172               darkyellow
+" Color: dark4         #0087d7           32                darkblue
+" Color: dark5         #d787d7           176               darkmagenta
+" Color: dark6         #00afaf           37                darkcyan
+" Color: dark7         #dadada           253               grey
+" Color: dark8         #707070           242               darkgrey
+" Color: dark9         #ff005f           197               red
+" Color: dark10        #00d75f           41                green
+" Color: dark11        #ffaf00           214               yellow
+" Color: dark12        #5fafff           75                blue
+" Color: dark13        #ff87ff           213               magenta
+" Color: dark14        #00d7d7           44                cyan
+" Color: dark15        #ffffff           231               white
+" Color: diffred       #d75f5f           167               darkred
+" Color: diffgreen     #00af00           34                darkgreen
+" Color: diffblue      #87afd7           110               darkblue
+" Color: diffpink      #d787d7           176               darkmagenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                green
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               darkyellow
+" Color: uiblack       #303030           236               darkgrey
+" Color: yasogrey      #1c1c1c           234               black
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a8a8a8           248               darkgrey
+" Color: errorred      #ff005f           197               red
+" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
+" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
+" Background: light
+" Color: brightwhite   #eeeeee           255               grey
+" Color: light0        #000000           16                black
+" Color: light1        #af0000           124               darkred
+" Color: light2        #005f00           22                darkgreen
+" Color: light3        #af5f00           130               darkyellow
+" Color: light4        #005faf           25                darkblue
+" Color: light5        #870087           90                darkmagenta
+" Color: light6        #008787           30                darkcyan
+" Color: light7        #d7d7d7           188               grey
+" Color: light8        #626262           241               darkgrey
+" Color: light9        #d70000           160               red
+" Color: light10       #008700           28                green
+" Color: light11       #d78700           172               yellow
+" Color: light12       #0087d7           32                blue
+" Color: light13       #af00af           127               magenta
+" Color: light14       #00afaf           37                cyan
+" Color: light15       #ffffff           231               white
+" Color: diffred       #d78787           174               red
+" Color: diffgreen     #87d787           114               green
+" Color: diffblue      #afafd7           146               blue
+" Color: diffpink      #d787d7           176               magenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                cyan
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               yellow
+" Color: invisigrey    #a8a8a8           248               darkgrey
+" Color: yasogrey      #e4e4e4           254               grey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: errorred      #ff005f           197               red
+" Term colors: light0 light1 light2 light3 light4 light5 light6 light7
+" Term colors: light8 light9 light10 light11 light12 light13 light14 light15
+" Background: any
+" vim: et ts=2 sw=2
--- a/runtime/colors/retrobox.vim
+++ b/runtime/colors/retrobox.vim
@@ -0,0 +1,874 @@
+" Name:         Retro Box
+" Description:  Retro groove color scheme similar to gruvbox originally designed by morhetz <morhetz@gmail.com>
+" Author:       Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
+" Maintainer:   Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
+" Website:      https://www.github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)
+" Last Updated: Sun 12 Mar 2023 15:14:04 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'retrobox'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link CursorColumn CursorLine
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link VisualNOS Visual
+hi! link Tag Special
+hi! link lCursor Cursor
+hi! link MessageWindow PMenu
+hi! link PopupNotification Todo
+hi! link CurSearch Search
+
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#1c1c1c', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2']
+  endif
+  hi Normal guifg=#ebdbb2 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#fabd2f guibg=#303030 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi SignColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi VertSplit guifg=#303030 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+  hi ErrorMsg guifg=#1c1c1c guibg=#fb4934 gui=bold cterm=bold
+  hi Folded guifg=#928374 guibg=#121212 gui=NONE cterm=NONE
+  hi LineNr guifg=#7c6f64 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#504945 gui=bold,underline cterm=bold,underline
+  hi NonText guifg=#504945 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#3c3836 guibg=#83a598 gui=bold cterm=bold
+  hi PmenuThumb guifg=NONE guibg=#7c6f64 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#fb4934 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#fb4934 guibg=#83a598 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#303030 guibg=#83a598 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi StatusLine guifg=#504945 guibg=#ebdbb2 gui=bold,reverse cterm=bold,reverse
+  hi StatusLineNC guifg=#3c3836 guibg=#a89984 gui=reverse cterm=reverse
+  hi TabLine guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#fbf1c7 guibg=#1c1c1c gui=bold cterm=bold
+  hi ToolbarButton guifg=#fbf1c7 guibg=#303030 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual guifg=#1c1c1c guibg=#83a598 gui=NONE cterm=NONE
+  hi WildMenu guifg=#83a598 guibg=#504945 gui=bold cterm=bold
+  hi EndOfBuffer guifg=#504945 guibg=NONE gui=NONE cterm=NONE
+  hi Conceal guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi DiffAdd guifg=#b8bb26 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffChange guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffDelete guifg=#fb4934 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffText guifg=#fabd2f guibg=#1c1c1c gui=reverse cterm=reverse
+  hi Directory guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi IncSearch guifg=#fe8019 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi ModeMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#fe8019 guibg=NONE gui=bold cterm=bold
+  hi Search guifg=#98971a guibg=#1c1c1c gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
+  hi SpellBad guifg=#fb4934 guibg=NONE guisp=#fb4934 gui=undercurl cterm=underline
+  hi SpellCap guifg=#83a598 guibg=NONE guisp=#83a598 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#8ec07c guibg=NONE guisp=#8ec07c gui=undercurl cterm=underline
+  hi SpellRare guifg=#d3869b guibg=NONE guisp=#d3869b gui=undercurl cterm=underline
+  hi Title guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#fb4934 guibg=NONE gui=bold cterm=bold
+  hi Boolean guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Character guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Conditional guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Define guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Debug guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Delimiter guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+  hi Exception guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Float guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Function guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi Identifier guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
+  hi Include guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Keyword guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Label guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Macro guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Number guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Operator guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi PreCondit guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Repeat guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialChar guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialComment guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi StorageClass guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#b8bb26 guibg=NONE gui=NONE cterm=NONE
+  hi Structure guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=fg guibg=#1c1c1c gui=bold cterm=bold
+  hi Type guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
+  hi Typedef guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#83a598 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#3c3836', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#7c6f64', '#928374', '#9d0006', '#79740e', '#b57614', '#076678', '#8f3f71', '#427b58', '#fbf1c7']
+  endif
+  hi Normal guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#b57614 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#928374 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi SignColumn guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi VertSplit guifg=#bdae93 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#ebe1b7 gui=NONE cterm=NONE
+  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
+  hi ErrorMsg guifg=#fbf1c7 guibg=#9d0006 gui=bold cterm=bold
+  hi Folded guifg=#928374 guibg=#ffffd7 gui=NONE cterm=NONE
+  hi LineNr guifg=#a89984 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#e5d4b1 gui=bold,underline cterm=bold,underline
+  hi NonText guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#3c3836 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#e5d4b1 guibg=#076678 gui=bold cterm=bold
+  hi PmenuThumb guifg=NONE guibg=#a89984 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#9d0006 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#9d0006 guibg=#076678 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#7c6f64 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#bdae93 guibg=#076678 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi StatusLine guifg=#bdae93 guibg=#3c3836 gui=bold,reverse cterm=bold,reverse
+  hi StatusLineNC guifg=#ebdbb2 guibg=#3c3836 gui=reverse cterm=reverse
+  hi TabLine guifg=#665c54 guibg=#ebdbb2 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#ebdbb2 guibg=#ebdbb2 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#282828 guibg=#fbf1c7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#282828 guibg=#bdae93 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual guifg=#fbf1c7 guibg=#076678 gui=NONE cterm=NONE
+  hi WildMenu guifg=#076678 guibg=#e5d4b1 gui=bold cterm=bold
+  hi EndOfBuffer guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
+  hi Conceal guifg=#076678 guibg=NONE gui=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi DiffAdd guifg=#79740e guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffChange guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#9d0006 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffText guifg=#b57614 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi Directory guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi IncSearch guifg=#ff5f00 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi ModeMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#ff5f00 guibg=NONE gui=bold cterm=bold
+  hi Search guifg=#98971a guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi SpellBad guifg=#9d0006 guibg=NONE guisp=#9d0006 gui=undercurl cterm=underline
+  hi SpellCap guifg=#076678 guibg=NONE guisp=#076678 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#427b58 guibg=NONE guisp=#427b58 gui=undercurl cterm=underline
+  hi SpellRare guifg=#8f3f71 guibg=NONE guisp=#8f3f71 gui=undercurl cterm=underline
+  hi Title guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#9d0006 guibg=NONE gui=bold cterm=bold
+  hi Boolean guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Character guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Conditional guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Define guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Debug guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Delimiter guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
+  hi Exception guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Float guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Function guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi Identifier guifg=#076678 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
+  hi Include guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Keyword guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Label guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Macro guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Number guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Operator guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi PreCondit guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Repeat guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialChar guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialComment guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi StorageClass guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#79740e guibg=NONE gui=NONE cterm=NONE
+  hi Structure guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=fg guibg=#fbf1c7 gui=bold cterm=bold
+  hi Type guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
+  hi Typedef guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#076678 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+endif
+
+if s:t_Co >= 256
+  if &background ==# 'dark'
+    hi Normal ctermfg=187 ctermbg=234 cterm=NONE
+    hi CursorLineNr ctermfg=214 ctermbg=236 cterm=NONE
+    hi FoldColumn ctermfg=102 ctermbg=234 cterm=NONE
+    hi SignColumn ctermfg=102 ctermbg=234 cterm=NONE
+    hi VertSplit ctermfg=236 ctermbg=234 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
+    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
+    hi ErrorMsg ctermfg=234 ctermbg=203 cterm=bold
+    hi Folded ctermfg=102 ctermbg=233 cterm=NONE
+    hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=239 cterm=bold,underline
+    hi NonText ctermfg=239 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=187 ctermbg=237 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=237 cterm=NONE
+    hi PmenuSel ctermfg=237 ctermbg=109 cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+    hi PmenuKind ctermfg=203 ctermbg=237 cterm=NONE
+    hi PmenuKindSel ctermfg=203 ctermbg=109 cterm=NONE
+    hi PmenuExtra ctermfg=102 ctermbg=237 cterm=NONE
+    hi PmenuExtraSel ctermfg=236 ctermbg=109 cterm=NONE
+    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=239 ctermbg=187 cterm=bold,reverse
+    hi StatusLineNC ctermfg=237 ctermbg=102 cterm=reverse
+    hi TabLine ctermfg=102 ctermbg=237 cterm=NONE
+    hi TabLineFill ctermfg=187 ctermbg=237 cterm=NONE
+    hi TabLineSel ctermfg=230 ctermbg=234 cterm=bold
+    hi ToolbarButton ctermfg=230 ctermbg=236 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+    hi WildMenu ctermfg=109 ctermbg=239 cterm=bold
+    hi EndOfBuffer ctermfg=239 ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=109 ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=142 ctermbg=234 cterm=reverse
+    hi DiffChange ctermfg=107 ctermbg=234 cterm=reverse
+    hi DiffDelete ctermfg=203 ctermbg=234 cterm=reverse
+    hi DiffText ctermfg=214 ctermbg=234 cterm=reverse
+    hi Directory ctermfg=142 ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=208 ctermbg=234 cterm=reverse
+    hi ModeMsg ctermfg=214 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=214 ctermbg=NONE cterm=bold
+    hi Question ctermfg=208 ctermbg=NONE cterm=bold
+    hi Search ctermfg=100 ctermbg=234 cterm=reverse
+    hi QuickFixLine ctermfg=107 ctermbg=234 cterm=reverse
+    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=109 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=107 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=175 ctermbg=NONE cterm=underline
+    hi Title ctermfg=142 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=203 ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Character ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Define ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=208 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
+    hi Exception ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Float ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Function ctermfg=142 ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Label ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Number ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=107 ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=107 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=203 ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=203 ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=203 ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=208 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=208 ctermbg=NONE cterm=NONE
+    hi String ctermfg=142 ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=234 cterm=bold
+    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=109 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=237 ctermbg=230 cterm=NONE
+    hi CursorLineNr ctermfg=172 ctermbg=188 cterm=NONE
+    hi FoldColumn ctermfg=102 ctermbg=230 cterm=NONE
+    hi SignColumn ctermfg=237 ctermbg=230 cterm=NONE
+    hi VertSplit ctermfg=144 ctermbg=230 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=229 cterm=NONE
+    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=188 cterm=NONE
+    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
+    hi ErrorMsg ctermfg=230 ctermbg=124 cterm=bold
+    hi Folded ctermfg=102 ctermbg=231 cterm=NONE
+    hi LineNr ctermfg=137 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=188 cterm=bold,underline
+    hi NonText ctermfg=188 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=237 ctermbg=188 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=188 cterm=NONE
+    hi PmenuSel ctermfg=188 ctermbg=23 cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=137 cterm=NONE
+    hi PmenuKind ctermfg=124 ctermbg=188 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=23 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=188 cterm=NONE
+    hi PmenuExtraSel ctermfg=144 ctermbg=23 cterm=NONE
+    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=144 ctermbg=237 cterm=bold,reverse
+    hi StatusLineNC ctermfg=187 ctermbg=237 cterm=reverse
+    hi TabLine ctermfg=59 ctermbg=187 cterm=NONE
+    hi TabLineFill ctermfg=187 ctermbg=187 cterm=NONE
+    hi TabLineSel ctermfg=235 ctermbg=230 cterm=bold
+    hi ToolbarButton ctermfg=235 ctermbg=144 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=230 ctermbg=23 cterm=NONE
+    hi WildMenu ctermfg=23 ctermbg=188 cterm=bold
+    hi EndOfBuffer ctermfg=188 ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=64 ctermbg=230 cterm=reverse
+    hi DiffChange ctermfg=29 ctermbg=230 cterm=reverse
+    hi DiffDelete ctermfg=124 ctermbg=230 cterm=reverse
+    hi DiffText ctermfg=172 ctermbg=230 cterm=reverse
+    hi Directory ctermfg=64 ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=202 ctermbg=230 cterm=reverse
+    hi ModeMsg ctermfg=237 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=237 ctermbg=NONE cterm=bold
+    hi Question ctermfg=202 ctermbg=NONE cterm=bold
+    hi Search ctermfg=100 ctermbg=230 cterm=reverse
+    hi QuickFixLine ctermfg=29 ctermbg=230 cterm=reverse
+    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=29 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=126 ctermbg=NONE cterm=underline
+    hi Title ctermfg=64 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=124 ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Character ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Define ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=202 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
+    hi Exception ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Float ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Function ctermfg=64 ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Label ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Number ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=29 ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=29 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=124 ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=124 ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=202 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=202 ctermbg=NONE cterm=NONE
+    hi String ctermfg=64 ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=230 cterm=bold
+    hi Type ctermfg=172 ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=172 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=23 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=White ctermbg=Black cterm=NONE
+    hi ColorColumn ctermfg=Black ctermbg=DarkYellow cterm=NONE
+    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=reverse
+    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=Black cterm=bold,underline
+    hi NonText ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=White ctermbg=DarkGray cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
+    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=DarkRed ctermbg=DarkGray cterm=NONE
+    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=gray ctermbg=DarkGray cterm=NONE
+    hi PmenuExtraSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
+    hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse
+    hi TabLine ctermfg=Black ctermbg=DarkGray cterm=NONE
+    hi TabLineFill ctermfg=Black ctermbg=DarkGray cterm=NONE
+    hi TabLineSel ctermfg=White ctermbg=Black cterm=bold
+    hi ToolbarButton ctermfg=White ctermbg=DarkGray cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
+    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=White ctermbg=Black cterm=bold
+    hi EndOfBuffer ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
+    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=Black cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=Black ctermbg=White cterm=NONE
+    hi ColorColumn ctermfg=White ctermbg=Grey cterm=NONE
+    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=reverse
+    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=White cterm=bold,underline
+    hi NonText ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=Black ctermbg=Grey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=DarkRed ctermbg=Grey cterm=NONE
+    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi PmenuExtraSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=DarkGray ctermbg=White cterm=bold,reverse
+    hi StatusLineNC ctermfg=Grey ctermbg=DarkGray cterm=reverse
+    hi TabLine ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi TabLineFill ctermfg=White ctermbg=Grey cterm=NONE
+    hi TabLineSel ctermfg=DarkGray ctermbg=White cterm=bold
+    hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Black ctermbg=White cterm=bold
+    hi EndOfBuffer ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
+    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=White cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=gray ctermbg=Black cterm=NONE
+    hi ColorColumn ctermfg=Black ctermbg=gray cterm=NONE
+    hi Comment ctermfg=gray ctermbg=NONE cterm=bold
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=reverse
+    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=gray ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=gray ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=gray ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=gray ctermbg=NONE cterm=bold,underline
+    hi NonText ctermfg=gray ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=DarkGray ctermbg=White cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
+    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=Red ctermbg=White cterm=NONE
+    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=DarkGray ctermbg=White cterm=NONE
+    hi PmenuExtraSel ctermfg=DarkGray ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=gray ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=gray ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
+    hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse
+    hi TabLine ctermfg=Black ctermbg=gray cterm=NONE
+    hi TabLineFill ctermfg=Black ctermbg=gray cterm=NONE
+    hi TabLineSel ctermfg=gray ctermbg=Black cterm=NONE
+    hi ToolbarButton ctermfg=Black ctermbg=gray cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
+    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Blue ctermbg=DarkGray cterm=bold
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
+    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=Black cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=Black ctermbg=Grey cterm=NONE
+    hi ColorColumn ctermfg=White ctermbg=Black cterm=NONE
+    hi Comment ctermfg=Black ctermbg=NONE cterm=bold
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=reverse
+    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=Black ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=Black ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=Black ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=Black ctermbg=NONE cterm=bold,underline
+    hi NonText ctermfg=Black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=Grey ctermbg=Black cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=Red ctermbg=Black cterm=NONE
+    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=Grey ctermbg=Black cterm=NONE
+    hi PmenuExtraSel ctermfg=Grey ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=Black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=Black ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=Black ctermbg=White cterm=bold,reverse
+    hi StatusLineNC ctermfg=Black ctermbg=White cterm=reverse
+    hi TabLine ctermfg=White ctermbg=Black cterm=NONE
+    hi TabLineFill ctermfg=White ctermbg=Black cterm=NONE
+    hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
+    hi ToolbarButton ctermfg=White ctermbg=Black cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=White ctermbg=Black cterm=NONE
+    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Blue ctermbg=Grey cterm=bold
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
+    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=White cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Color: neutralred              #cc241d        160            DarkRed
+" Color: neutralgreen            #98971a        100            DarkGreen
+" Color: neutralyellow           #d79921        172            DarkYellow
+" Color: neutralblue             #458588        66             DarkBlue
+" Color: neutralpurple           #b16286        132            DarkMagenta
+" Color: neutralaqua             #689d6a        71             DarkCyan
+" Color: neutralorange           #d65d0e        166            LightRed
+" Background: dark
+" Color: bg0                     #1c1c1c        234            Black
+" Color: bg1                     #3c3836        237            DarkGray
+" Color: bg2                     #504945        239            DarkGray
+" Color: bg3                     #303030        236
+" Color: bg4                     #7c6f64        243
+" Color: bg5                     #000000        16             DarkGray
+" Color: bg6                     #121212        233            DarkGray
+" Color: fg0                     #fbf1c7        230            White
+" Color: fg1                     #ebdbb2        187            White
+" Color: fg2                     #d5c4a1        187
+" Color: fg3                     #bdae93        144
+" Color: fg4                     #a89984        102            gray
+" Color: grey                    #928374        102            DarkGray
+" Color: red                     #fb4934        203            Red
+" Color: green                   #b8bb26        142            Green
+" Color: yellow                  #fabd2f        214            Yellow
+" Color: blue                    #83a598        109            Blue
+" Color: purple                  #d3869b        175            Magenta
+" Color: aqua                    #8ec07c        107            Cyan
+" Color: orange                  #fe8019        208            Magenta
+" Term colors: bg0  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
+" Term colors: grey red        green        yellow        blue        purple        aqua        fg1
+" Background: light
+" Color: bg0                     #fbf1c7        230            White
+" Color: bg1                     #ebdbb2        187            Grey
+" Color: bg2                     #e5d4b1        188            Grey
+" Color: bg3                     #bdae93        144
+" Color: bg4                     #a89984        137
+" Color: bg5                     #ebe1b7        229            Grey
+" Color: bg6                     #ffffd7        231            Grey
+" Color: fg0                     #282828        235            DarkGray
+" Color: fg1                     #3c3836        237            Black
+" Color: fg2                     #503836        237
+" Color: fg3                     #665c54        59
+" Color: fg4                     #7c6f64        243            Black
+" Color: grey                    #928374        102            DarkGray
+" Color: red                     #9d0006        124            Red
+" Color: green                   #79740e        64             Green
+" Color: yellow                  #b57614        172            Yellow
+" Color: blue                    #076678        23             Blue
+" Color: purple                  #8f3f71        126            Magenta
+" Color: aqua                    #427b58        29             Cyan
+" Color: orange                  #ff5f00        202            Magenta
+" Term colors: fg1  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
+" Term colors: grey red        green        yellow        blue        purple        aqua        bg0
+" Background: any
+" vim: et ts=2 sw=2
--- a/runtime/colors/ron.vim
+++ b/runtime/colors/ron.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:29:07 MSK
+" Last Updated: Fri 02 Sep 2022 09:50:56 MSK

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'ron'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -46,6 +46,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/shine.vim
+++ b/runtime/colors/shine.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:02:11 2022
+" Last Updated: Fri 02 Sep 2022 09:51:42 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'shine'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']
@@ -28,6 +28,8 @@ hi! link EndOfBuffer NonText
 hi! link ErrorMsg Error
 hi! link Tag Special
 hi! link Operator Statement
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#dadada gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#dadada gui=NONE cterm=NONE
@@ -104,6 +106,8 @@ if s:t_Co >= 256
  hi! link ErrorMsg Error
  hi! link Tag Special
  hi! link Operator Statement
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi Folded ctermfg=18 ctermbg=253 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=253 cterm=NONE
--- a/runtime/colors/slate.vim
+++ b/runtime/colors/slate.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ralph Amissah <ralph@amissah.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:03:10 2022
+" Last Updated: Fri 02 Sep 2022 09:52:25 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,10 +13,10 @@ set background=dark
 hi clear
 let g:colors_name = 'slate'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#ff0000', '#5f8700', '#ffff00', '#87d7ff', '#d7d787', '#ffd7af', '#666666', '#333333', '#ffafaf', '#00875f', '#ffd700', '#5f87d7', '#afaf87', '#ff8787', '#ffffff']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
 hi! link Terminal Normal
 hi! link LineNrAbove LineNr
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#262626 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
@@ -53,18 +55,18 @@ hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
 hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE
 hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
 hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE
 hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
+hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
+hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE
 hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE
 hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
@@ -99,6 +101,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=235 cterm=NONE
  hi EndOfBuffer ctermfg=68 ctermbg=NONE cterm=NONE
  hi StatusLine ctermfg=16 ctermbg=144 cterm=NONE
@@ -128,18 +132,18 @@ if s:t_Co >= 256
  hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE
  hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE
  hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
  hi Error ctermfg=196 ctermbg=231 cterm=reverse
  hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse
  hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE
  hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
  hi Question ctermfg=220 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
  hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE
  hi Search ctermfg=16 ctermbg=173 cterm=NONE
  hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
+  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
  hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE
+  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
  hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline
  hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline
@@ -169,12 +173,12 @@ if s:t_Co >= 256
 endif

 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
@@ -198,38 +202,38 @@ if s:t_Co >= 16
  hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE
  hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi Error ctermfg=darkred ctermbg=white cterm=reverse
  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
  hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
  hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE
  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
  hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline
  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi String ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Statement ctermfg=blue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=red ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
+  hi Structure ctermfg=green ctermbg=NONE cterm=NONE
+  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
  hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
  hi Define ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=green ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -274,27 +278,28 @@ if s:t_Co >= 8
  hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Function ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold
  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
  hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -376,29 +381,45 @@ if s:t_Co >= 0
 endif

 " Background: dark
-" Color: foreground  #FFFFFF        231            white
-" Color: background  #262626        235            black
-" Color: color00     #000000        16             black
-" Color: color08     #333333        236            darkgrey
-" Color: color01     #FF0000        196            darkred
-" Color: color09     #FFAFAF        217            red
-" Color: color02     #5F8700        64             darkgreen
-" Color: color10     #00875F        29             green
-" Color: color03     #ffff00        226            darkyellow
-" Color: color11     #FFD700        220            yellow
-" Color: color04     #87d7FF        117            darkblue
-" Color: color12     #5F87D7        68             blue
-" Color: color05     #d7d787        186            darkmagenta
-" Color: color13     #AFAF87        144            magenta
-" Color: color06     #FFD7AF        223            darkcyan
-" Color: color14     #FF8787        210            cyan
-" Color: color07     #666666        241            grey
-" Color: color15     #FFFFFF        231            white
-" Color: color16     #D7875F        173            darkmagenta
-" Color: color17     #00FF00        46             darkgreen
-" Color: Pmenu       #4A4A4A        239            darkgrey
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
+" Color: foreground    #FFFFFF           231               white
+" Color: background    #262626           235               black
+" Color: color00       #000000           16                black
+" Color: color08       #333333           236               darkgrey
+" Color: color01       #FF0000           196               darkred
+" Color: color09       #FFAFAF           217               red
+" Color: color02       #5F8700           64                darkgreen
+" Color: color10       #00875F           29                green
+" Color: color03       #ffff00           226               darkyellow
+" Color: color11       #FFD700           220               yellow
+" Color: color04       #87d7FF           117               darkblue
+" Color: color12       #5F87D7           68                blue
+" Color: color05       #d7d787           186               darkmagenta
+" Color: color13       #AFAF87           144               magenta
+" Color: color06       #FFD7AF           223               darkcyan
+" Color: color14       #FF8787           210               cyan
+" Color: color07       #666666           241               grey
+" Color: color15       #FFFFFF           231               white
+" Color: color16       #D7875F           173               darkmagenta
+" Color: color17       #00FF00           46                darkgreen
+" Color: Pmenu         #4A4A4A           239               darkgrey
+" Term colors: x_black    x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red     x_green     x_yellow     x_blue     x_magenta     x_cyan     x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- a/runtime/colors/sorbet.vim
+++ b/runtime/colors/sorbet.vim
@@ -0,0 +1,444 @@
+" Name:         sorbet
+" Description:  A shallow grave, a monument to the ruined age.
+" Author:       Maxence Weynans <neutaaaaan@gmail.com>
+" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)`
+" Last Updated: Wed 15 Mar 2023 05:40:19 PM CET
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'sorbet'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link Terminal Normal
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Debug Special
+hi! link Delimiter Special
+hi! link ErrorMsg Error
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link lCursor Cursor
+hi! link debugPC CursorLine
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff']
+endif
+hi Normal guifg=#dadada guibg=#161821 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#262831 gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi CursorColumn guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#d7d7ff guibg=#363841 gui=NONE cterm=NONE
+hi DiffAdd guifg=#00af5f guibg=#000000 gui=reverse cterm=reverse
+hi DiffChange guifg=#87afff guibg=#000000 gui=reverse cterm=reverse
+hi DiffDelete guifg=#d7005f guibg=#000000 gui=reverse cterm=reverse
+hi DiffText guifg=#ff87ff guibg=#000000 gui=reverse cterm=reverse
+hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi FoldColumn guifg=#8787af guibg=NONE gui=NONE cterm=NONE
+hi Folded guifg=#5f5f87 guibg=#161821 gui=NONE cterm=NONE
+hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+hi LineNr guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+hi Pmenu guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
+hi PmenuKind guifg=#000000 guibg=#a6a8b1 gui=bold cterm=bold
+hi PmenuSbar guifg=#707070 guibg=#5f5f87 gui=NONE cterm=NONE
+hi PmenuSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
+hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
+hi PmenuKindSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi PmenuThumb guifg=#dadada guibg=#d7d7ff gui=NONE cterm=NONE
+hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#5f5f87 guibg=NONE gui=bold cterm=bold
+hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl cterm=underline
+hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl cterm=underline
+hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl cterm=underline
+hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl cterm=underline
+hi StatusLine guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi StatusLineNC guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
+hi TabLine guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
+hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi TabLineSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi VertSplit guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+hi VisualNOS guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#d7d7ff guibg=#161821 gui=bold cterm=bold
+hi Comment guifg=#af87d7 guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi Error guifg=#ff5f5f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+hi Identifier guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi String guifg=#d7af5f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#5fd7af guibg=NONE gui=bold,reverse cterm=bold,reverse
+hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
+hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
+hi DiffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=bold,reverse
+
+if s:t_Co >= 256
+  hi Normal ctermfg=253 ctermbg=233 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorLineNr ctermfg=189 ctermbg=237 cterm=NONE
+  hi DiffAdd ctermfg=35 ctermbg=16 cterm=reverse
+  hi DiffChange ctermfg=111 ctermbg=16 cterm=reverse
+  hi DiffDelete ctermfg=161 ctermbg=16 cterm=reverse
+  hi DiffText ctermfg=213 ctermbg=16 cterm=reverse
+  hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=60 ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=103 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=60 ctermbg=233 cterm=NONE
+  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+  hi LineNr ctermfg=60 ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+  hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+  hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+  hi PmenuSbar ctermfg=242 ctermbg=60 cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=189 cterm=NONE
+  hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE
+  hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold
+  hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE
+  hi Question ctermfg=253 ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+  hi Search ctermfg=39 ctermbg=16 cterm=reverse
+  hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=60 ctermbg=NONE cterm=bold
+  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=110 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=140 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=73 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=16 ctermbg=189 cterm=bold
+  hi StatusLineNC ctermfg=103 ctermbg=16 cterm=reverse
+  hi TabLine ctermfg=103 ctermbg=16 cterm=reverse
+  hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=16 ctermbg=189 cterm=bold
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=60 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=214 ctermbg=16 cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=237 cterm=NONE
+  hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=189 ctermbg=233 cterm=bold
+  hi Comment ctermfg=140 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=167 ctermbg=NONE cterm=NONE
+  hi Error ctermfg=203 ctermbg=16 cterm=bold,reverse
+  hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=73 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=110 ctermbg=NONE cterm=NONE
+  hi String ctermfg=179 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=79 ctermbg=NONE cterm=bold,reverse
+  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+  hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
+  hi DiffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+  hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+  hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+  hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+  hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+  hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+  hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: guibg         #161821           233               black
+" Color: statusline    #d7d7ff           189               white
+" Color: statuslineNC  #8787af           103               grey
+" Color: darkuipurple  #5f5f87           60                grey
+" Color: dark0         #000000           16                black
+" Color: dark1         #d75f5f           167               darkred
+" Color: dark2         #87d75f           113               darkgreen
+" Color: dark3         #d7af5f           179               darkyellow
+" Color: dark4         #87afd7           110               darkblue
+" Color: dark5         #af87d7           140               darkmagenta
+" Color: dark6         #5fafaf           73                darkcyan
+" Color: dark7         #dadada           253               grey
+" Color: dark8         #707070           242               darkgrey
+" Color: dark9         #ff5f5f           203               red
+" Color: dark10        #87ff5f           119               green
+" Color: dark11        #ffd75f           221               yellow
+" Color: dark12        #87d7ff           117               blue
+" Color: dark13        #d787ff           177               magenta
+" Color: dark14        #5fd7d7           80                cyan
+" Color: dark15        #ffffff           231               white
+" Color: diffred       #d7005f           161               darkred
+" Color: diffgreen     #00af5f           35                darkgreen
+" Color: diffblue      #87afff           111               darkblue
+" Color: diffpink      #ff87ff           213               darkmagenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #5fd7af           79                green
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               darkyellow
+" Color: uiblack       #363841           237               darkgrey
+" Color: yasogrey      #262831           235               black
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a6a8b1           248               darkgrey
+" Color: errorred      #ff5f5f           203               red
+" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
+" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
+" vim: et ts=2 sw=2
--- a/runtime/colors/tools/check_colors.vim
+++ b/runtime/colors/tools/check_colors.vim
@@ -6,10 +6,23 @@ vim9script
 def Test_check_colors()
    const savedview = winsaveview()
    cursor(1, 1)
-    var err = {}
+
+    # err is
+    # {
+    #    colors_name: "message",
+    #    init: "message",
+    #    background: "message",
+    #    ....etc
+    #    highlight: {
+    #       'Normal': "Missing ...",
+    #       'Conceal': "Missing ..."
+    #       ....etc
+    #    }
+    # }
+    var err: dict<any> = {}

    # 1) Check g:colors_name is existing
-    if !search('\<\%(g:\)\?colors_name\>', 'cnW')
+    if search('\<\%(g:\)\?colors_name\>', 'cnW') == 0
        err['colors_name'] = 'g:colors_name not set'
    else
        err['colors_name'] = 'OK'
@@ -180,11 +193,12 @@ def Test_check_colors()
    Result(err)
 enddef

-def Result(err: any)
+
+def Result(err: dict<any>)
    var do_groups: bool = v:false
    echohl Title | echomsg "---------------" | echohl Normal
    for key in sort(keys(err))
-        if key is 'highlight'
+        if key == 'highlight'
            do_groups = !empty(err[key])
            continue
        else
--- a/runtime/colors/torte.vim
+++ b/runtime/colors/torte.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Thorsten Maerz <info@netztorte.de>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:04:48 2022
+" Last Updated: Fri 02 Sep 2022 09:53:21 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'torte'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#cccccc guibg=#000000 gui=NONE cterm=NONE
 hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=251 ctermbg=16 cterm=NONE
  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
--- a/runtime/colors/wildcharm.vim
+++ b/runtime/colors/wildcharm.vim
@@ -0,0 +1,753 @@
+" Name:         Wild Charm
+" Description:  Vibrant and playful, at least one popular AI thinks it is.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: Sun 12 Mar 2023 18:46:06 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'wildcharm'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link MessageWindow PMenu
+hi! link PopupNotification Todo
+hi! link CurSearch IncSearch
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#d0d0d0', '#767676', '#ff5f87', '#00d75f', '#ffaf00', '#00afff', '#ff87ff', '#00d7d7', '#ffffff']
+  endif
+  hi Normal guifg=#d0d0d0 guibg=#000000 gui=NONE cterm=NONE
+  hi Statusline guifg=#d0d0d0 guibg=#000000 gui=reverse cterm=reverse
+  hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#000000 guibg=#ff87ff gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#d0d0d0 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#ff5f87 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#d7005f guibg=#ffaf00 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
+  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#875fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#00d75f gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi debugPC guifg=#0087d7 guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#00afaf guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#000000 guibg=#0087d7 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#000000 guibg=#00afff gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#00afaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#00af5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#ff5f87 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+  hi Type guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#00d7d7 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#875fff guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#00afff guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#afffaf guibg=#5f875f gui=NONE cterm=NONE
+  hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE
+  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE
+  hi diffAdded guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+  endif
+  hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi Statusline guifg=#ffffff guibg=#5f5f5f gui=NONE cterm=NONE
+  hi StatuslineNC guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi VertSplit guifg=#d0d0d0 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#808080 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ffffff guibg=#870087 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#808080 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#d70000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#af0000 guibg=#d78700 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#8700ff guibg=#ffffff gui=reverse cterm=reverse
+  hi Search guifg=#ffffff guibg=#008700 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi WildMenu guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#008787 guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse
+  hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Folded guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#008787 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#005faf guibg=NONE gui=NONE cterm=NONE
+  hi Type guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#008787 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#8700ff guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#005faf guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#005f00 guibg=#afd7af gui=NONE cterm=NONE
+  hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE
+  hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE
+  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+endif
+
+if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link MessageWindow PMenu
+  hi! link PopupNotification Todo
+  hi! link CurSearch IncSearch
+  if &background ==# 'dark'
+    hi Normal ctermfg=252 ctermbg=16 cterm=NONE
+    hi Statusline ctermfg=252 ctermbg=16 cterm=reverse
+    hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
+    hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
+    hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=252 ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=16 ctermbg=214 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=252 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=204 ctermbg=236 cterm=NONE
+    hi PmenuKindSel ctermfg=161 ctermbg=214 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
+    hi PmenuExtraSel ctermfg=16 ctermbg=214 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=161 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=161 cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=41 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=213 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=99 ctermbg=16 cterm=reverse
+    hi Search ctermfg=16 ctermbg=41 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=214 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=214 cterm=NONE
+    hi debugPC ctermfg=32 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=37 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=16 ctermbg=32 cterm=NONE
+    hi VisualNOS ctermfg=16 ctermbg=39 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=161 ctermbg=231 cterm=reverse
+    hi SpellCap ctermfg=37 ctermbg=16 cterm=reverse
+    hi SpellLocal ctermfg=41 ctermbg=16 cterm=reverse
+    hi SpellRare ctermfg=213 ctermbg=16 cterm=reverse
+    hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=204 ctermbg=NONE cterm=NONE
+    hi String ctermfg=41 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=213 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=39 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=44 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=99 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=39 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=157 ctermbg=65 cterm=NONE
+    hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE
+    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
+    hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE
+    hi diffAdded ctermfg=35 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=161 ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=16 ctermbg=231 cterm=NONE
+    hi Statusline ctermfg=231 ctermbg=59 cterm=NONE
+    hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE
+    hi VertSplit ctermfg=252 ctermbg=252 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=240 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
+    hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
+    hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=249 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=249 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=249 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=249 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=249 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=231 ctermbg=172 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=240 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=160 ctermbg=254 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=172 cterm=NONE
+    hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE
+    hi PmenuExtraSel ctermfg=231 ctermbg=172 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=160 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=90 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=130 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=93 ctermbg=231 cterm=reverse
+    hi Search ctermfg=231 ctermbg=28 cterm=NONE
+    hi IncSearch ctermfg=231 ctermbg=172 cterm=NONE
+    hi WildMenu ctermfg=231 ctermbg=172 cterm=NONE
+    hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=30 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=32 cterm=NONE
+    hi VisualNOS ctermfg=231 ctermbg=25 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Folded ctermfg=240 ctermbg=254 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=160 ctermbg=231 cterm=reverse
+    hi SpellCap ctermfg=30 ctermbg=231 cterm=reverse
+    hi SpellLocal ctermfg=28 ctermbg=231 cterm=reverse
+    hi SpellRare ctermfg=127 ctermbg=231 cterm=reverse
+    hi Comment ctermfg=245 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=124 ctermbg=NONE cterm=NONE
+    hi String ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=90 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=25 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=130 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=93 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=25 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=22 ctermbg=151 cterm=NONE
+    hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE
+    hi DiffText ctermfg=23 ctermbg=152 cterm=NONE
+    hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE
+    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=reverse
+    hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
+    hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+    hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
+    hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=green cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi VisualNOS ctermfg=black ctermbg=blue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi SpellBad ctermfg=darkred ctermbg=white cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpellLocal ctermfg=green ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=magenta ctermbg=black cterm=reverse
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=red ctermbg=NONE cterm=NONE
+    hi String ctermfg=green ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Type ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=white cterm=NONE
+    hi Statusline ctermfg=white ctermbg=darkgrey cterm=NONE
+    hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi VertSplit ctermfg=lightgrey ctermbg=lightgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
+    hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=white cterm=reverse
+    hi Search ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi IncSearch ctermfg=white ctermbg=yellow cterm=NONE
+    hi WildMenu ctermfg=white ctermbg=yellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=blue cterm=NONE
+    hi VisualNOS ctermfg=white ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi SpellBad ctermfg=red ctermbg=white cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=white cterm=reverse
+    hi SpellRare ctermfg=magenta ctermbg=white cterm=reverse
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE
+    hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE
+    hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=grey cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=black ctermbg=black cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
+    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=black cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: any
+" Background: dark
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #d7005f        161            darkred
+" Color: color09                 #ff5f87        204            red
+" Color: color02                 #00af5f        35             darkgreen
+" Color: color10                 #00d75f        41             green
+" Color: color03                 #d78700        172            darkyellow
+" Color: color11                 #ffaf00        214            yellow
+" Color: color04                 #0087d7        32             darkblue
+" Color: color12                 #00afff        39             blue
+" Color: color05                 #d787d7        176            darkmagenta
+" Color: color13                 #ff87ff        213            magenta
+" Color: color06                 #00afaf        37             darkcyan
+" Color: color14                 #00d7d7        44             cyan
+" Color: color07                 #d0d0d0        252            grey
+" Color: color15                 #ffffff        231            white
+" Color: color16                 #875fff        99             darkred
+" Color: colorLine               #262626        235            darkgrey
+" Color: colorB                  #303030        236            darkgrey
+" Color: colorNonT               #585858        240            grey
+" Color: colorTab                #585858        240            grey
+" Color: colorC                  #ffffff        231            white
+" Color: colorlC                 #ff5fff        207            magenta
+" Color: colorDim                #878787        102            grey
+" Color: colorMP                 #ff00af        199            magenta
+" Color: diffAdd                 #5f875f        65             darkmagenta
+" Color: diffAddFg               #afffaf        157            black
+" Color: diffDelete              #875f5f        95             darkred
+" Color: diffDeleteFg            #ffafaf        217            black
+" Color: diffChange              #5f5f5f        59             lightgray
+" Color: diffChangeFg            #d0d0d0        252            black
+" Color: diffText                #5f8787        66             cyan
+" Color: diffTextFg              #afffff        159            black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: light
+" Color: color00                 #000000        16             black
+" Color: color08                 #808080        240            darkgrey
+" Color: color01                 #af0000        124            darkred
+" Color: color09                 #d70000        160            red
+" Color: color02                 #008700        28             darkgreen
+" Color: color10                 #5faf5f        71             green
+" Color: color03                 #af5f00        130            darkyellow
+" Color: color11                 #d78700        172            yellow
+" Color: color04                 #005faf        25             darkblue
+" Color: color12                 #0087d7        32             blue
+" Color: color05                 #870087        90             darkmagenta
+" Color: color13                 #af00af        127            magenta
+" Color: color06                 #008787        30             darkcyan
+" Color: color14                 #00afaf        37             cyan
+" Color: color07                 #8a8a8a        245            grey
+" Color: color15                 #ffffff        231            white
+" Color: color16                 #8700ff        93             darkred
+" Color: colorCm                 #8a8a8a        245            darkgrey
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
+" Color: colorNonT               #b2b2b2        249            darkgrey
+" Color: colorTab                #d0d0d0        252            lightgrey
+" Color: colorC                  #000000        16             black
+" Color: colorlC                 #FF00FF        201            magenta
+" Color: colorV                  #5F87AF        67             darkblue
+" Color: colorDim                #626262        241            darkgrey
+" Color: colorSt                 #5f5f5f        59             darkgrey
+" Color: colorMP                 #ff00af        199            magenta
+" Color: diffAdd                 #afd7af        151            darkmagenta
+" Color: diffAddFg               #005f00        22             black
+" Color: diffDelete              #ffd7d7        224            darkred
+" Color: diffDeleteFg            #875f5f        95             black
+" Color: diffChange              #dadada        253            lightgray
+" Color: diffChangeFg            #262626        235            black
+" Color: diffText                #afd7d7        152            cyan
+" Color: diffTextFg              #005f5f        23             black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: any
+" vim: et ts=2 sw=2
--- a/runtime/colors/zaibatsu.vim
+++ b/runtime/colors/zaibatsu.vim
@@ -0,0 +1,563 @@
+" Name:         zaibatsu
+" Description:  "If you believe the journalists, he's the single wealthiest individual, period. As rich as some zaibatsu. But there's the catch, really: is he an individual? In the sense that you are, or I am? No." -- William Gibson, Count Zero
+" Author:       Romain Lafourcade <romainlafourcade@gmail.com>
+" Maintainer:   Romain Lafourcade <romainlafourcade@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: Sun Mar 12 17:21:15 2023
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'zaibatsu'
+
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff']
+endif
+hi Normal guifg=#ffffff guibg=#0e0024 gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#afafff guibg=#0e0024 gui=NONE cterm=NONE
+hi NonText guifg=#878092 guibg=#0e0024 gui=NONE cterm=NONE
+hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi StatusLine guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi StatusLineNC guifg=#0e0024 guibg=#afaab6 gui=NONE cterm=NONE
+hi Pmenu guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuSbar guifg=#d7d5db guibg=#d7d5db gui=NONE cterm=NONE
+hi PmenuSel guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
+hi PmenuThumb guifg=#878092 guibg=#878092 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
+hi! link PmenuExtraSel PmenuSel
+hi PmenuKind guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
+hi! link PmenuKindSel PmenuSel
+hi ColorColumn guifg=NONE guibg=#510039 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
+hi CursorColumn guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
+hi WildMenu guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Cursor guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
+hi CursorIM guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
+hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
+hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+hi FoldColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi Folded guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
+hi IncSearch guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
+hi LineNr guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi ModeMsg guifg=#0e0024 guibg=#87ff00 gui=NONE cterm=NONE
+hi MoreMsg guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Question guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
+hi QuickFixLine guifg=#ffafff guibg=#0e0024 gui=reverse cterm=reverse
+hi Search guifg=#87ffff guibg=#0e0024 gui=reverse cterm=reverse
+hi SignColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#878092 guibg=NONE gui=NONE cterm=NONE
+hi ToolbarButton guifg=#ffffff guibg=#5e556d gui=NONE cterm=NONE
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi VertSplit guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#0e0024 guibg=#5fd7ff gui=NONE cterm=NONE
+hi VisualNOS guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi WarningMsg guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 gui=reverse cterm=reverse
+hi debugPC guifg=#87ffff guibg=#5f00d7 gui=reverse cterm=reverse
+hi Directory guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Comment guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#ffff5f guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#878092 guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi Type guifg=#ff5faf guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+hi! link CurSearch IncSearch
+hi! link CursorLineFold CursorLine
+hi! link CursorLineNr CursorLine
+hi! link CursorLineSign CursorLine
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
+hi! link Terminal Normal
+hi! link lCursor Cursor
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Delimiter Special
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link String Constant
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link Terminal Normal
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi DiffAdd guifg=#87ff00 guibg=#362b49 gui=reverse cterm=reverse
+hi DiffChange guifg=#afafff guibg=#362b49 gui=reverse cterm=reverse
+hi DiffText guifg=#d7d5db guibg=#362b49 gui=reverse cterm=reverse
+hi DiffDelete guifg=#ff5faf guibg=#362b49 gui=reverse cterm=reverse
+
+if s:t_Co >= 256
+  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
+  hi EndOfBuffer ctermfg=147 ctermbg=16 cterm=NONE
+  hi NonText ctermfg=103 ctermbg=16 cterm=NONE
+  hi SpellBad ctermfg=205 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=219 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=16 ctermbg=231 cterm=NONE
+  hi StatusLineNC ctermfg=16 ctermbg=146 cterm=NONE
+  hi Pmenu ctermfg=16 ctermbg=231 cterm=NONE
+  hi PmenuSbar ctermfg=189 ctermbg=189 cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=147 cterm=NONE
+  hi PmenuThumb ctermfg=103 ctermbg=103 cterm=NONE
+  hi PmenuExtra ctermfg=103 ctermbg=231 cterm=NONE
+  hi! link PmenuExtraSel PmenuSel
+  hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=147 cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
+  hi CursorIM ctermfg=16 ctermbg=227 cterm=NONE
+  hi Error ctermfg=160 ctermbg=231 cterm=reverse
+  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+  hi FoldColumn ctermfg=39 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=214 ctermbg=16 cterm=reverse
+  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+  hi LineNr ctermfg=147 ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=16 ctermbg=118 cterm=NONE
+  hi MoreMsg ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=219 ctermbg=16 cterm=reverse
+  hi Search ctermfg=123 ctermbg=16 cterm=reverse
+  hi SignColumn ctermfg=39 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=103 ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=231 ctermbg=60 cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=147 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=16 ctermbg=81 cterm=NONE
+  hi VisualNOS ctermfg=16 ctermbg=231 cterm=NONE
+  hi WarningMsg ctermfg=219 ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=118 ctermbg=56 cterm=reverse
+  hi debugPC ctermfg=123 ctermbg=56 cterm=reverse
+  hi Directory ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=147 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=227 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=103 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=39 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=118 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=219 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=205 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=118 ctermbg=237 cterm=reverse
+  hi DiffChange ctermfg=147 ctermbg=237 cterm=reverse
+  hi DiffText ctermfg=189 ctermbg=237 cterm=reverse
+  hi DiffDelete ctermfg=205 ctermbg=237 cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE
+  hi! link PmenuExtraSel PmenuSel
+  hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
+  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
+  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE
+  hi! link PmenuExtra Pmenu
+  hi! link PmenuExtraSel PmenuSel
+  hi! link PmenuKind Pmenu
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
+  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
+  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: background    #0e0024           16                black
+" Color: darkred       #510039           52                darkred
+" Color: darkgreen     #5faf00           70                darkgreen
+" Color: darkyellow    #ffaf00           214               darkyellow
+" Color: darkblue      #5f00d7           56                darkblue
+" Color: darkmagenta   #d700ff           165               darkmagenta
+" Color: darkcyan      #00afff           39                darkcyan
+" Color: red           #ff5faf           205               red
+" Color: green         #87ff00           118               green
+" Color: yellow        #ffff5f           227               yellow
+" Color: blue          #afafff           147               blue
+" Color: magenta       #ffafff           219               magenta
+" Color: cyan          #87ffff           123               cyan
+" Color: white         #ffffff           231               white
+" Color: neutral1      #D7D5DB           189               gray
+" Color: neutral2      #AFAAB6           146               gray
+" Color: neutral3      #878092           103               darkgray
+" Color: neutral4      #5E556D           60                darkgray
+" Color: neutral5      #362B49           237               darkgray
+" Color: error         #d70000           160               red
+" Color: visual        #5FD7FF           81                darkcyan
+" Color: Xdarkred      #d7005f           ~
+" Color: Xdarkgreen    #00af5f           ~
+" Color: Xdarkblue     #5f5fff           ~
+" Color: Xdarkwhite    #d7d7d7           ~
+" Color: Xgrey         #878787           ~
+" Color: Xbrightgreen  #00d700           ~
+" Color: Xbrightyellow #ffd700           ~
+" Color: Xbrightblue   #8787ff           ~
+" Color: Xbrightmagenta #ff87ff          ~
+" Color: Xbrightcyan   #00ffff           ~
+" Term colors: background
+" Term colors: Xdarkred
+" Term colors: Xdarkgreen
+" Term colors: darkyellow
+" Term colors: Xdarkblue
+" Term colors: darkmagenta
+" Term colors: darkcyan
+" Term colors: neutral1
+" Term colors: neutral3
+" Term colors: red
+" Term colors: Xbrightgreen
+" Term colors: Xbrightyellow
+" Term colors: Xbrightblue
+" Term colors: Xbrightmagenta
+" Term colors: Xbrightcyan
+" Term colors: white
+" Color: bgDiffA       #5F875F           65                darkgreen
+" Color: bgDiffT       #C6C6C6           251               grey
+" Color: fgDiffW       #FFFFFF           231               white
+" Color: fgDiffB       #000000           16                black
+" Color: bgDiffC8      #5F87AF           67                darkblue
+" Color: bgDiffD8      #AF5FAF           133               darkmagenta
+" vim: et ts=2 sw=2
--- a/runtime/colors/zellner.vim
+++ b/runtime/colors/zellner.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:05:43 2022
+" Last Updated: Fri 02 Sep 2022 09:54:15 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'zellner'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
@@ -95,6 +97,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
--- a/runtime/compiler/context.vim
+++ b/runtime/compiler/context.vim
@@ -1,54 +1,48 @@
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
+vim9script

-if exists("current_compiler")
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
+
+if exists("g:current_compiler")
  finish
 endif
-let s:keepcpo= &cpo
-set cpo&vim

-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+import autoload '../autoload/context.vim'
+
+if exists(":CompilerSet") != 2 # Older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
+g:current_compiler = 'context'
+
 if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
+  (!filereadable('Makefile') && !filereadable('makefile'))
+  &l:makeprg =  join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
 else
-  let current_compiler = 'make'
+  g:current_compiler = 'make'
 endif

-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
+const context_errorformat = join([
+  "%-Popen source%.%#> %f",
+  "%-Qclose source%.%#> %f",
+  "%-Popen source%.%#name '%f'",
+  "%-Qclose source%.%#name '%f'",
+  "tex %trror%.%#error on line %l in file %f: %m",
+  "%Elua %trror%.%#error on line %l in file %f:",
+  "%+Emetapost %#> error: %#",
+  "%Emetafun%.%#error: %m",
+  "! error: %#%m",
+  "%-C %#",
+  "%C! %m",
+  "%Z[ctxlua]%m",
+  "%+C<*> %.%#",
+  "%-C%.%#",
+  "%Z...%m",
+  "%-Zno-error",
+  "%-G%.%#"], ",")

-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+execute 'CompilerSet errorformat=' .. escape(context_errorformat, ' ')

-let &cpo = s:keepcpo
-unlet s:keepcpo
+# vim: sw=2 fdm=marker
--- a/runtime/compiler/dotnet.vim
+++ b/runtime/compiler/dotnet.vim
@@ -0,0 +1,39 @@
+" Vim compiler file
+" Compiler:            dotnet build (.NET CLI)
+" Maintainer:          Nick Jensen <nickspoon@gmail.com>
+" Last Change:         2022-12-06
+" License:             Vim (see :h license)
+" Repository:          https://github.com/nickspoons/vim-cs
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dotnet"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if get(g:, "dotnet_errors_only", v:false)
+  CompilerSet makeprg=dotnet\ build\ -nologo
+		     \\ -consoleloggerparameters:NoSummary
+		     \\ -consoleloggerparameters:ErrorsOnly
+else
+  CompilerSet makeprg=dotnet\ build\ -nologo\ -consoleloggerparameters:NoSummary
+endif
+
+if get(g:, "dotnet_show_project_file", v:true)
+  CompilerSet errorformat=%E%f(%l\\,%c):\ %trror\ %m,
+			 \%W%f(%l\\,%c):\ %tarning\ %m,
+			 \%-G%.%#
+else
+  CompilerSet errorformat=%E%f(%l\\,%c):\ %trror\ %m\ [%.%#],
+			 \%W%f(%l\\,%c):\ %tarning\ %m\ [%.%#],
+			 \%-G%.%#
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/compiler/hare.vim
+++ b/runtime/compiler/hare.vim
@@ -0,0 +1,31 @@
+" Vim compiler file
+" Compiler: Hare Compiler
+" Maintainer: Amelia Clarke <me@rsaihe.dev>
+" Last Change: 2022-09-21
+
+if exists("g:current_compiler")
+  finish
+endif
+let g:current_compiler = "hare"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if filereadable("Makefile") || filereadable("makefile")
+  CompilerSet makeprg=make
+else
+  CompilerSet makeprg=hare\ build
+endif
+
+CompilerSet errorformat=
+  \Error\ %f:%l:%c:\ %m,
+  \Syntax\ error:\ %.%#\ at\ %f:%l:%c\\,\ %m,
+  \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: tabstop=2 shiftwidth=2 expandtab
--- a/runtime/compiler/raco.vim
+++ b/runtime/compiler/raco.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'raco'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racomake.vim
+++ b/runtime/compiler/racomake.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco make (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racomake'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ make\ --\ %
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racosetup.vim
+++ b/runtime/compiler/racosetup.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco setup (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racosetup'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ setup
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racotest.vim
+++ b/runtime/compiler/racotest.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco test (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racotest'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ test\ %
+CompilerSet errorformat=location:%f:%l:%c
--- a/runtime/compiler/zig.vim
+++ b/runtime/compiler/zig.vim
@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler: Zig Compiler
+" Upstream: https://github.com/ziglang/zig.vim
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "zig"
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+
+" a subcommand must be provided for the this compiler (test, build-exe, etc)
+if has('patch-7.4.191')
+    CompilerSet makeprg=zig\ \$*\ \%:S
+else
+    CompilerSet makeprg=zig\ \$*\ \"%\"
+endif
+
+" TODO: improve errorformat as needed.
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
--- a/runtime/compiler/zig_build.vim
+++ b/runtime/compiler/zig_build.vim
@@ -0,0 +1,29 @@
+" Vim compiler file
+" Compiler: Zig Compiler (zig build)
+" Upstream: https://github.com/ziglang/zig.vim
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/zig.vim
+let current_compiler = 'zig_build'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if exists('g:zig_build_makeprg_params')
+	execute 'CompilerSet makeprg=zig\ build\ '.escape(g:zig_build_makeprg_params, ' \|"').'\ $*'
+else
+	CompilerSet makeprg=zig\ build\ $*
+endif
+
+" TODO: anything to add to errorformat for zig build specifically?
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
--- a/runtime/compiler/zig_build_exe.vim
+++ b/runtime/compiler/zig_build_exe.vim
@@ -0,0 +1,27 @@
+" Vim compiler file
+" Compiler: Zig Compiler (zig build-exe)
+" Upstream: https://github.com/ziglang/zig.vim
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/zig.vim
+let current_compiler = 'zig_build_exe'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if has('patch-7.4.191')
+  CompilerSet makeprg=zig\ build-exe\ \%:S\ \$* 
+else
+  CompilerSet makeprg=zig\ build-exe\ \"%\"\ \$* 
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
--- a/Show More
+++ b/Show More