1995 files changed, 10170 insertions, 10170 deletions

diff --git a/uvim/runtime/syntax/2html.vim b/uvim/runtime/syntax/2html.mnv
index ca40810e80..76bac07038 100644
--- a/uvim/runtime/syntax/2html.vim
+++ b/uvim/runtime/syntax/2html.mnv
@@ -1,17 +1,17 @@
-" Vim syntax support file
+" MNV syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
 " Last Change: 2024 Nov 02
 "
 " Additional contributors:
 "
-"             Original by Bram Moolenaar <Bram@vim.org>
+"             Original by Bram Moolenaar <Bram@mnv.org>
 "             Modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 "             XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>
 "             Made w3 compliant by Edd Barrett <vext01@gmail.com>
 "             Added html_font. Edd Barrett <vext01@gmail.com>
 "             Progress bar based off code from "progressbar widget" plugin by
 "               Andreas Politz, heavily modified:
-"               http://www.vim.org/scripts/script.php?script_id=2006
+"               http://www.mnv.org/scripts/script.php?script_id=2006
 "
 "             See Mercurial change logs for more!
 
@@ -21,7 +21,7 @@
 let s:cpo_sav = &cpo
 let s:ls  = &ls
 let s:ei_sav = &eventignore
-set cpo&vim
+set cpo&mnv
 
 " HTML filetype can take a while to load/highlight if the destination file
 " already exists.
@@ -742,7 +742,7 @@ endif
 
 " If the user is sourcing this script directly then the plugin version isn't
 " known because the main plugin script didn't load. In the usual case where the
-" user still has the full Vim runtime installed, or has this full plugin
+" user still has the full MNV runtime installed, or has this full plugin
 " installed in a package or something, then we can extract the version from the
 " main plugin file at it's usual spot relative to this file. Otherwise the user
 " is assembling their runtime piecemeal and we have no idea what versions of
@@ -761,7 +761,7 @@ if exists("g:loaded_2html_plugin")
   let s:pluginversion = g:loaded_2html_plugin
 else
   if !exists("g:unloaded_tohtml_plugin")
-    let s:main_plugin_path = expand("<sfile>:p:h:h").."/plugin/tohtml.vim"
+    let s:main_plugin_path = expand("<sfile>:p:h:h").."/plugin/tohtml.mnv"
     if filereadable(s:main_plugin_path)
       let s:lines = readfile(s:main_plugin_path, "", 20)
       call filter(s:lines, 'v:val =~ "loaded_2html_plugin = "')
@@ -820,13 +820,13 @@ let s:old_magic = &magic
 set magic
 
 " set the fileencoding to match the charset we'll be using
-let &l:fileencoding=s:settings.vim_encoding
+let &l:fileencoding=s:settings.mnv_encoding
 
 " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte
 " order mark is highly recommend on the web when using multibyte encodings. But,
-" it is not a good idea to include it on UTF-8 files. Otherwise, let Vim
+" it is not a good idea to include it on UTF-8 files. Otherwise, let MNV
 " determine when it is actually inserted.
-if s:settings.vim_encoding == 'utf-8'
+if s:settings.mnv_encoding == 'utf-8'
   setlocal nobomb
 else
   setlocal bomb
@@ -871,7 +871,7 @@ if !s:settings.no_doc
   endif
   call extend(s:lines, [
 	\ ("<title>"..expand("%:p:~").."</title>"),
-	\ ("<meta name=\"Generator\" content=\"Vim/"..v:version/100.."."..v:version%100..'"'..s:tag_close),
+	\ ("<meta name=\"Generator\" content=\"MNV/"..v:version/100.."."..v:version%100..'"'..s:tag_close),
 	\ ("<meta name=\"plugin-version\" content=\""..s:pluginversion..'"'..s:tag_close)
 	\ ])
   call add(s:lines, '<meta name="syntax" content="'..s:current_syntax..'"'..s:tag_close)
@@ -1009,7 +1009,7 @@ if !s:settings.no_doc
 	    \ "",
 	    \ "  /* 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.."')",
+	    \ "  while (node && node.id != 'mnvCodeElement"..s:settings.id_suffix.."')",
 	    \ "  {",
 	    \ "    if (node.className == 'closed-fold')",
 	    \ "    {",
@@ -1050,10 +1050,10 @@ endif
 if s:settings.no_pre
   " if we're not using CSS we use a font tag which can't have a div inside
   if s:settings.use_css
-    call extend(s:lines, ["<div id='vimCodeElement" .. s:settings.id_suffix .. "'>"])
+    call extend(s:lines, ["<div id='mnvCodeElement" .. s:settings.id_suffix .. "'>"])
   endif
 else
-  call extend(s:lines, ["<pre id='vimCodeElement" .. s:settings.id_suffix .. "'>"])
+  call extend(s:lines, ["<pre id='mnvCodeElement" .. s:settings.id_suffix .. "'>"])
 endif
 
 exe s:orgwin .. "wincmd w"
@@ -1807,7 +1807,7 @@ exe s:newwin .. "wincmd w"
 call setline(1, s:lines)
 unlet s:lines
 
-" Mangle modelines so Vim doesn't try to use HTML text as a modeline if editing
+" Mangle modelines so MNV doesn't try to use HTML text as a modeline if editing
 " this file in the future; need to do this after generating all the text in case
 " the modeline text has different highlight groups which all turn out to be
 " stripped from the final output.
@@ -1817,7 +1817,7 @@ unlet s:lines
 " Make sure the user doesn't do syntax folding when loading a generated file,
 " using a modeline.
 if !s:settings.no_modeline
-  call append(line('$'), "<!-- vim: set foldmethod=manual : -->")
+  call append(line('$'), "<!-- mnv: set foldmethod=manual : -->")
 endif
 
 " Now, when we finally know which, we define the colors and styles
@@ -1886,7 +1886,7 @@ if s:settings.use_css && !s:settings.no_doc
 	+3
       endif
       " The line number column inside the foldtext is styled just like the fold
-      " text in Vim, but it should use the prevent_copy settings of line number
+      " text in MNV, but it should use the prevent_copy settings of line number
       " rather than fold text. Apply the prevent_copy styles to foldtext
       " specifically for line numbers, which always come after the fold column,
       " or at the beginning of the line.
@@ -2069,4 +2069,4 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " Make sure any patches will probably use consistent indent
-"   vim: ts=8 sw=2 sts=2 noet
+"   mnv: ts=8 sw=2 sts=2 noet
diff --git a/uvim/runtime/syntax/8th.vim b/uvim/runtime/syntax/8th.mnv
index b84bfbf251..40f41b788e 100644
--- a/uvim/runtime/syntax/8th.vim
+++ b/uvim/runtime/syntax/8th.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     8th
 " Version:      26.02
 " Last Change:  2026 Jan 28
 " Maintainer:   Ron Aaron <ron@aaron-tech.com>
 " URL:          https://8th-dev.com/
 " Filetypes:    *.8th
-" NOTE:         You should also have the ftplugin/8th.vim file to set 'isk'
+" NOTE:         You should also have the ftplugin/8th.mnv file to set 'isk'
 
 if exists("b:current_syntax")
    finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 syn clear
 
 syn sync ccomment 
@@ -440,7 +440,7 @@ syn match eighthInteger '\<\x*\d\x*\>'  " *2* --- this order!
 syn match eighthInteger '\<%[0-1]*[0-1]\+\>'
 syn match eighthInteger "\<'.\>"
 
-syn include @SQL syntax/sql.vim
+syn include @SQL syntax/sql.mnv
 syn region eightSQL matchgroup=Define start=/\<SQL\[\s/ end=/\<]\>/ contains=@SQL keepend
 syn region eightSQL matchgroup=Define start=/\<SQL{\s/ end=/\<}\>/ contains=@SQL keepend
 syn region eightSQL matchgroup=Define start=/\<SQL!\s/ end=/\<!\>/ contains=@SQL keepend
@@ -507,4 +507,4 @@ let b:current_syntax = "8th"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ft=vim ts=4 sw=4 nocin:si 
+" mnv: ft=mnv ts=4 sw=4 nocin:si 
diff --git a/uvim/runtime/syntax/Makefile b/uvim/runtime/syntax/Makefile
index d0f71270ac..c2239bf943 100644
--- a/uvim/runtime/syntax/Makefile
+++ b/uvim/runtime/syntax/Makefile
@@ -1,27 +1,27 @@
 # Portable Makefile for running syntax tests.
 
 # To run the test manually:
-# ../../src/vim -u 'testdir/runtest.vim' --cmd 'breakadd func RunTest'
+# ../../src/mnv -u 'testdir/runtest.mnv' --cmd 'breakadd func RunTest'
 
-# Override this if needed, the default assumes Vim was built in the src dir.
-#VIMPROG = vim
-VIMPROG = ../../src/vim
+# Override this if needed, the default assumes MNV was built in the src dir.
+#MNVPROG = mnv
+MNVPROG = ../../src/mnv
 
 # "runtime" relative to "runtime/syntax/testdir"
-VIMRUNTIME = ../..
+MNVRUNTIME = ../..
 
 # Uncomment this line to use valgrind for memory leaks and extra warnings.
 # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
 
 # Trace ruler liveness on demand.
-# VIM_SYNTAX_TEST_LOG = `pwd`/testdir/failed/00-TRACE_LOG
+# MNV_SYNTAX_TEST_LOG = `pwd`/testdir/failed/00-TRACE_LOG
 
-# ENVVARS = LC_ALL=C VIM_SYNTAX_TEST_LOG="$(VIM_SYNTAX_TEST_LOG)"
+# ENVVARS = LC_ALL=C MNV_SYNTAX_TEST_LOG="$(MNV_SYNTAX_TEST_LOG)"
 # ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
 # Run the syntax tests with a C locale
 ENVVARS = LC_ALL=C
 
-RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
+RUN_MNVTEST = MNVRUNTIME=$(MNVRUNTIME) $(VALGRIND) $(ENVVARS) ../$(MNVPROG) -f $(GUI_FLAG)
 
 # Uncomment this line for debugging
 # DEBUGLOG = --log testlog
@@ -34,15 +34,15 @@ phonies = clean executables test testclean
 # If a test succeeds a testdir/done/{name} file will be written.
 # If a test fails a testdir/failed/{name}.dump file will be written.
 # Progress and error messages can be found in "testdir/messages".
-# Comment out the "> /dev/null" part to see the in-progress Vim behaviors.
+# Comment out the "> /dev/null" part to see the in-progress MNV behaviors.
 test:
-	@# the "vimcmd" file is used by the screendump utils
-	@echo "../$(VIMPROG)" > testdir/vimcmd
-	@echo "$(RUN_VIMTEST)" >> testdir/vimcmd
+	@# the "mnvcmd" file is used by the screendump utils
+	@echo "../$(MNVPROG)" > testdir/mnvcmd
+	@echo "$(RUN_MNVTEST)" >> testdir/mnvcmd
 	@# Trace ruler liveness on demand.
 	@#mkdir -p testdir/failed
-	@#touch "$(VIM_SYNTAX_TEST_LOG)"
-	VIMRUNTIME=$(VIMRUNTIME) $(ENVVARS) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim > /dev/null
+	@#touch "$(MNV_SYNTAX_TEST_LOG)"
+	MNVRUNTIME=$(MNVRUNTIME) $(ENVVARS) $(MNVPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.mnv > /dev/null
 	@# FIXME: Temporarily show the whole file to find out what goes wrong
 	@#if [ -f testdir/messages ]; then tail -n 6 testdir/messages; fi
 	@if [ -f testdir/messages ]; then cat testdir/messages; fi
@@ -57,7 +57,7 @@ executables:
 	@! find testdir/input -type f -perm /a+x -exec echo Executable syntax test found: \{\} \; | grep :
 
 clean testclean:
-	rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages testdir/Xtestscript testdir/Xfilter testdir/testdeps.mk
+	rm -f testdir/failed/* testdir/done/* testdir/mnvcmd testdir/messages testdir/Xtestscript testdir/Xfilter testdir/testdeps.mk
 
 # Collect all input filenames and their file types.
 testnames != set +f; \
@@ -68,7 +68,7 @@ awk 'BEGIN { \
         types[parts[1]]; \
         print names[3]; \
     } \
-    delete types["vim9"]; \
+    delete types["mnv9"]; \
     split("$(phonies)", scratch); \
     for (phony in scratch) \
         phonies[scratch[phony]]; \
diff --git a/uvim/runtime/syntax/README.txt b/uvim/runtime/syntax/README.txt
index 756ae41587..cd27f82dab 100644
--- a/uvim/runtime/syntax/README.txt
+++ b/uvim/runtime/syntax/README.txt
@@ -1,17 +1,17 @@
-This directory contains Vim scripts for syntax highlighting.
+This directory contains MNV scripts for syntax highlighting.
 
-These scripts are not for a language, but are used by Vim itself:
+These scripts are not for a language, but are used by MNV itself:
 
-syntax.vim	Used for the ":syntax on" command.  Uses synload.vim.
+syntax.mnv	Used for the ":syntax on" command.  Uses synload.mnv.
 
-manual.vim	Used for the ":syntax manual" command.  Uses synload.vim.
+manual.mnv	Used for the ":syntax manual" command.  Uses synload.mnv.
 
-synload.vim	Contains autocommands to load a language file when a certain
+synload.mnv	Contains autocommands to load a language file when a certain
 		file name (extension) is used.  And sets up the Syntax menu
 		for the GUI.
 
-nosyntax.vim	Used for the ":syntax off" command.  Undo the loading of
-		synload.vim.
+nosyntax.mnv	Used for the ":syntax off" command.  Undo the loading of
+		synload.mnv.
 
 The "shared" directory contains generated files and what is used by more than
 one syntax.
@@ -19,25 +19,25 @@ one syntax.
 
 A few special files:
 
-2html.vim	Converts any highlighted file to HTML (GUI only).
-colortest.vim	Check for color names and actual color on screen.
-hitest.vim	View the current highlight settings.
-whitespace.vim  View Tabs and Spaces.
+2html.mnv	Converts any highlighted file to HTML (GUI only).
+colortest.mnv	Check for color names and actual color on screen.
+hitest.mnv	View the current highlight settings.
+whitespace.mnv  View Tabs and Spaces.
 
 
 If you want to write a syntax file, read the docs at ":help usr_44.txt".
 
 If you make a new syntax file which would be useful for others, please send it
-to the vim-dev mailing list <vim-dev@vim.org>.  Include instructions for
+to the mnv-dev mailing list <mnv-dev@mnv.org>.  Include instructions for
 detecting the file type for this language, by file name extension or by
 checking a few lines in the file. And please write the file in a portable way,
 see ":help 44.12".
 
 If you have remarks about an existing file, send them to the maintainer of
-that file.  Only when you get no response send a message to the vim-dev
-mailing list: <vim-dev@vim.org>.
+that file.  Only when you get no response send a message to the mnv-dev
+mailing list: <mnv-dev@mnv.org>.
 
 If you are the maintainer of a syntax file and make improvements, send the new
-version to the vim-dev mailing list: <vim-dev@vim.org>
+version to the mnv-dev mailing list: <mnv-dev@mnv.org>
 
-For further info see ":help syntax" in Vim.
+For further info see ":help syntax" in MNV.
diff --git a/uvim/runtime/syntax/a2ps.vim b/uvim/runtime/syntax/a2ps.mnv
index afe3af1eed..d80b17b5f3 100644
--- a/uvim/runtime/syntax/a2ps.vim
+++ b/uvim/runtime/syntax/a2ps.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             a2ps(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword a2psPreProc       Include
                               \ nextgroup=a2psKeywordColon
diff --git a/uvim/runtime/syntax/a65.vim b/uvim/runtime/syntax/a65.mnv
index 6445b9438b..594f682b9f 100644
--- a/uvim/runtime/syntax/a65.vim
+++ b/uvim/runtime/syntax/a65.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	xa 6502 cross assembler
 " Maintainer:	Clemens Kirchgatterer <clemens@1541.org>
 " Last Change:	2016 Aug 31
diff --git a/uvim/runtime/syntax/aap.vim b/uvim/runtime/syntax/aap.mnv
index 87cedab30f..268836967c 100644
--- a/uvim/runtime/syntax/aap.vim
+++ b/uvim/runtime/syntax/aap.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	A-A-P recipe
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,9 +10,9 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-syn include @aapPythonScript syntax/python.vim
+syn include @aapPythonScript syntax/python.mnv
 
 syn match       aapVariable /$[-+?*="'\\!]*[a-zA-Z0-9_.]*/
 syn match       aapVariable /$[-+?*="'\\!]*([a-zA-Z0-9_.]*)/
@@ -156,4 +156,4 @@ let b:current_syntax = "aap"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/abap.vim b/uvim/runtime/syntax/abap.mnv
index 627e51504a..85f7a4c852 100644
--- a/uvim/runtime/syntax/abap.vim
+++ b/uvim/runtime/syntax/abap.mnv
@@ -1,4 +1,4 @@
-" Vim ABAP syntax file
+" MNV ABAP syntax file
 "    Language: SAP - ABAP/R4
 "  Maintainer: Marius Piedallu van Wyk <lailoken@gmail.com>
 " Last Change: 2021 Jan 02
@@ -193,4 +193,4 @@ hi def link abapHex            Number
 
 let b:current_syntax = "abap"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/abaqus.vim b/uvim/runtime/syntax/abaqus.mnv
index e6f025d8f4..0ad9586191 100644
--- a/uvim/runtime/syntax/abaqus.vim
+++ b/uvim/runtime/syntax/abaqus.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Abaqus finite element input file (www.hks.com)
 " Maintainer:	Carl Osterwisch <costerwi@gmail.com>
 " Last Change:	2002 Feb 24
diff --git a/uvim/runtime/syntax/abc.vim b/uvim/runtime/syntax/abc.mnv
index 1a7b3bf4be..aa88f527ba 100644
--- a/uvim/runtime/syntax/abc.vim
+++ b/uvim/runtime/syntax/abc.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	abc music notation language
 " Maintainer:	James Allwright <J.R.Allwright@westminster.ac.uk>
-" URL:		http://perun.hscs.wmin.ac.uk/~jra/vim/syntax/abc.vim
+" URL:		http://perun.hscs.wmin.ac.uk/~jra/mnv/syntax/abc.mnv
 " Last Change:	27th April 2001
 
 " quit when a syntax file was already loaded
@@ -48,4 +48,4 @@ hi def link abcNote			Constant
 
 let b:current_syntax = "abc"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/abel.vim b/uvim/runtime/syntax/abel.mnv
index dbed541ba8..45377458b7 100644
--- a/uvim/runtime/syntax/abel.vim
+++ b/uvim/runtime/syntax/abel.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ABEL
 " Maintainer:	John Cook <johncook3@gmail.com>
 " Last Change:	2011 Dec 27
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " this language is oblivious to case
 syn case ignore
@@ -158,4 +158,4 @@ let b:current_syntax = "abel"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/abnf.vim b/uvim/runtime/syntax/abnf.mnv
index 13459eb9f8..832828ee86 100644
--- a/uvim/runtime/syntax/abnf.vim
+++ b/uvim/runtime/syntax/abnf.mnv
@@ -1,8 +1,8 @@
-" Vim compiler file
+" MNV compiler file
 " Language:	abnf
 " Maintainer:	A4-Tacks <wdsjxhno1001@163.com>
 " Last Change:	2025 Mar 05
-" Upstream:	https://github.com/A4-Tacks/abnf.vim
+" Upstream:	https://github.com/A4-Tacks/abnf.mnv
 
 " Implementing RFC-5234, RFC-7405
 
@@ -30,4 +30,4 @@ hi def link abnfProse		String
 hi def link abnfNumVal		Number
 hi def link abnfRepeat		Repeat
 
-" vim:noet:ts=8:sts=8:nowrap
+" mnv:noet:ts=8:sts=8:nowrap
diff --git a/uvim/runtime/syntax/acedb.vim b/uvim/runtime/syntax/acedb.mnv
index 2c2cd701b7..33628e2ec9 100644
--- a/uvim/runtime/syntax/acedb.vim
+++ b/uvim/runtime/syntax/acedb.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	AceDB model files
 " Maintainer:	Stewart Morris (Stewart.Morris@ed.ac.uk)
 " Last change:	Thu Apr 26 10:38:01 BST 2001
-" URL:		http://www.ed.ac.uk/~swmorris/vim/acedb.vim
+" URL:		http://www.ed.ac.uk/~swmorris/mnv/acedb.mnv
 
 " Syntax file to handle all $ACEDB/wspec/*.wrm files, primarily models.wrm
 " AceDB software is available from http://www.acedb.org
diff --git a/uvim/runtime/syntax/ada.vim b/uvim/runtime/syntax/ada.mnv
index 415c9522fb..e7827a3175 100644
--- a/uvim/runtime/syntax/ada.vim
+++ b/uvim/runtime/syntax/ada.mnv
@@ -1,7 +1,7 @@
 "----------------------------------------------------------------------------
-"  Description: Vim Ada syntax file
+"  Description: MNV Ada syntax file
 "     Language: Ada (2005)
-"	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
+"	   $Id: ada.mnv 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
 "   Maintainer: Martin Krischik
 "		David A. Wheeler <dwheeler@dwheeler.com>
@@ -11,11 +11,11 @@
 "	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/syntax/ada.vim $
-"		http://www.dwheeler.com/vim
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/mnv/syntax/ada.mnv $
+"		http://www.dwheeler.com/mnv
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK ' should not be in iskeyword.
-"		16.07.2006 MK Ada-Mode as vim-ball
+"		16.07.2006 MK Ada-Mode as mnv-ball
 "		02.10.2006 MK Better folding.
 "		15.10.2006 MK Bram's suggestion for runtime integration
 "		05.11.2006 MK Spell check for comments and strings only
@@ -25,7 +25,7 @@
 " The formal spec of Ada 2005 (ARM) is the "Ada 2005 Reference Manual".
 " For more Ada 2005 info, see http://www.gnuada.org and http://www.adapower.com.
 "
-" This vim syntax file works on vim 7.0 only and makes use of most of Voim 7.0 
+" This mnv syntax file works on mnv 7.0 only and makes use of most of Voim 7.0 
 " advanced features.
 "------------------------------------------------------------------------------
 
@@ -33,7 +33,7 @@ if exists("b:current_syntax") || version < 700
     finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = "ada"
 
@@ -50,7 +50,7 @@ syntax   case ignore
 "
 for b:Item in g:ada#Keywords
    " Standard Exceptions (including I/O).
-   " We'll highlight the standard exceptions, similar to vim's Python mode.
+   " We'll highlight the standard exceptions, similar to mnv's Python mode.
    " It's possible to redefine the standard exceptions as something else,
    " but doing so is very bad practice, so simply highlighting them makes sense.
    if b:Item['kind'] == "x"
@@ -233,7 +233,7 @@ if exists("ada_withuse_ordinary")
 else
    " Highlight "with" and "use" clauses like C's "#include" when they're used
    " to reference other compilation units; otherwise they're ordinary keywords.
-   " If we have vim 6.0 or later, we'll use its advanced pattern-matching
+   " If we have mnv 6.0 or later, we'll use its advanced pattern-matching
    " capabilities so that we won't match leading spaces.
    syntax match adaKeyword	"\<with\>"
    syntax match adaKeyword	"\<use\>"
@@ -268,7 +268,7 @@ syntax region  adaComment
 
 " Section: line errors {{{1
 "
-" Note: Line errors have become quite slow with Vim 7.0
+" Note: Line errors have become quite slow with MNV 7.0
 "
 if exists("g:ada_line_errors")
     syntax match adaLineError "\(^.\{79}\)\@<=."  contains=ALL containedin=ALL
@@ -362,7 +362,7 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "   Copyright (C) 2006	Martin Krischik
 "
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
+"   MNV is Charityware - see ":help license" or uganda.txt for licence details.
 "------------------------------------------------------------------------------
-"vim: textwidth=78 nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-"vim: foldmethod=marker
+"mnv: textwidth=78 nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
+"mnv: foldmethod=marker
diff --git a/uvim/runtime/syntax/aflex.vim b/uvim/runtime/syntax/aflex.mnv
index aa8b5f84fe..24f3d1b0ba 100644
--- a/uvim/runtime/syntax/aflex.vim
+++ b/uvim/runtime/syntax/aflex.mnv
@@ -1,10 +1,10 @@
 
-" Vim syntax file
+" MNV syntax file
 " Language:	AfLex (from Lex syntax file)
 " Maintainer:	Mathieu Clabaut <mathieu.clabaut@free.fr>
 " LastChange:	02 May 2001
 " Original:	Lex, maintained by Dr. Charles E. Campbell, Jr.
-" Comment:	Replaced sourcing c.vim file by ada.vim and rename lex*
+" Comment:	Replaced sourcing c.mnv file by ada.mnv and rename lex*
 "		in aflex*
 
 " quit when a syntax file was already loaded
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the Ada syntax to start with
-runtime! syntax/ada.vim
+runtime! syntax/ada.mnv
 unlet b:current_syntax
 
 
@@ -48,7 +48,7 @@ syn region aflexPatCode matchgroup=Delimiter start="{" matchgroup=Delimiter end=
 syn keyword aflexCFunctions	BEGIN	input	unput	woutput	yyleng	yylook	yytext
 syn keyword aflexCFunctions	ECHO	output	winput	wunput	yyless	yymore	yywrap
 
-" <c.vim> includes several ALLBUTs; these have to be treated so as to exclude aflex* groups
+" <c.mnv> includes several ALLBUTs; these have to be treated so as to exclude aflex* groups
 syn cluster cParenGroup	add=aflex.*
 syn cluster cDefineGroup	add=aflex.*
 syn cluster cPreProcGroup	add=aflex.*
@@ -79,4 +79,4 @@ hi def link aflexSep		Delimiter
 
 let b:current_syntax = "aflex"
 
-" vim:ts=10
+" mnv:ts=10
diff --git a/uvim/runtime/syntax/ahdl.vim b/uvim/runtime/syntax/ahdl.mnv
index 3a40dcfaea..c898a09505 100644
--- a/uvim/runtime/syntax/ahdl.vim
+++ b/uvim/runtime/syntax/ahdl.mnv
@@ -1,4 +1,4 @@
-" Vim syn file
+" MNV syn file
 " Language:	Altera AHDL
 " Maintainer:	John Cook <john.cook@kla-tencor.com>
 " Last Change:	2001 Apr 25
@@ -78,4 +78,4 @@ hi def link ahdlTodo		Todo
 
 
 let b:current_syntax = "ahdl"
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/aidl.vim b/uvim/runtime/syntax/aidl.mnv
index 3a79433aa9..2f89ef478b 100644
--- a/uvim/runtime/syntax/aidl.vim
+++ b/uvim/runtime/syntax/aidl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	aidl (Android Interface Definition Language)
 "		https://developer.android.com/guide/components/aidl
 " Maintainer:	Dominique Pelle <dominique.pelle@tomtom.com>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
    finish
 endif
 
-source <sfile>:p:h/java.vim
+source <sfile>:p:h/java.mnv
 
 syn keyword aidlParamDir in out inout
 syn keyword aidlKeyword const oneway parcelable
diff --git a/uvim/runtime/syntax/alsaconf.vim b/uvim/runtime/syntax/alsaconf.mnv
index 143fcc0a2e..65fc448b3b 100644
--- a/uvim/runtime/syntax/alsaconf.vim
+++ b/uvim/runtime/syntax/alsaconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             alsaconf(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword alsoconfTodo        contained FIXME TODO XXX NOTE
 
diff --git a/uvim/runtime/syntax/amiga.vim b/uvim/runtime/syntax/amiga.mnv
index 858c1a430e..0b00adce89 100644
--- a/uvim/runtime/syntax/amiga.vim
+++ b/uvim/runtime/syntax/amiga.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     AmigaDOS
 " Maintainer:   Ola Söder <rolfkopman@gmail.com>
 " First Author: Charles E. Campbell
diff --git a/uvim/runtime/syntax/aml.vim b/uvim/runtime/syntax/aml.mnv
index 46621edbe9..b5bfbdfdf8 100644
--- a/uvim/runtime/syntax/aml.vim
+++ b/uvim/runtime/syntax/aml.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	AML (ARC/INFO Arc Macro Language)
 " Written By:	Nikki Knuit <Nikki.Knuit@gems3.gov.bc.ca>
 " Maintainer:	Todd Glover <todd.glover@gems9.gov.bc.ca>
diff --git a/uvim/runtime/syntax/ampl.vim b/uvim/runtime/syntax/ampl.mnv
index ad78f7d729..fb57353d1b 100644
--- a/uvim/runtime/syntax/ampl.vim
+++ b/uvim/runtime/syntax/ampl.mnv
@@ -135,6 +135,6 @@ hi def link amplPiecewise		Special
 
 let b:current_syntax = "ampl"
 
-" vim: ts=8
+" mnv: ts=8
 
 
diff --git a/uvim/runtime/syntax/ant.vim b/uvim/runtime/syntax/ant.mnv
index b0231236dd..a38264e632 100644
--- a/uvim/runtime/syntax/ant.vim
+++ b/uvim/runtime/syntax/ant.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		ANT build file (xml)
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
@@ -11,9 +11,9 @@ if exists("b:current_syntax")
 endif
 
 let s:ant_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-runtime! syntax/xml.vim
+runtime! syntax/xml.mnv
 
 syn case ignore
 
@@ -24,7 +24,7 @@ if !exists('*AntSyntaxScript')
 	if filereadable(s:include)
 	    exe 'syn include @ant'.a:tagname.' '.s:include
 	else
-	    exe 'syn include @ant'.a:tagname." $VIMRUNTIME/syntax/".a:synfilename
+	    exe 'syn include @ant'.a:tagname." $MNVRUNTIME/syntax/".a:synfilename
 	endif
 
 	exe 'syn region ant'.a:tagname
@@ -38,8 +38,8 @@ if !exists('*AntSyntaxScript')
 endif
 
 " TODO: add more script languages here ?
-call AntSyntaxScript('javascript', 'javascript.vim')
-call AntSyntaxScript('jpython', 'python.vim')
+call AntSyntaxScript('javascript', 'javascript.mnv')
+call AntSyntaxScript('jpython', 'python.mnv')
 
 
 syn cluster xmlTagHook add=antElement
@@ -94,4 +94,4 @@ let b:current_syntax = "ant"
 let &cpo = s:ant_cpo_save
 unlet s:ant_cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/antlr.vim b/uvim/runtime/syntax/antlr.mnv
index 9b0b061ae1..53658adcbb 100644
--- a/uvim/runtime/syntax/antlr.vim
+++ b/uvim/runtime/syntax/antlr.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Antlr:	ANTLR, Another Tool For Language Recognition <www.antlr.org>
 " Maintainer:	Mathieu Clabaut <mathieu.clabaut@free.fr>
 " LastChange:	02 May 2001
-" Original:	Comes from JavaCC.vim
+" Original:	Comes from JavaCC.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -11,11 +11,11 @@ endif
 
 " This syntac file is a first attempt. It is far from perfect...
 
-" Uses java.vim, and adds a few special things for JavaCC Parser files.
+" Uses java.mnv, and adds a few special things for JavaCC Parser files.
 " Those files usually have the extension  *.jj
 
-" source the java.vim file
-runtime! syntax/java.vim
+" source the java.mnv file
+runtime! syntax/java.mnv
 unlet b:current_syntax
 
 "remove catching errors caused by wrong parenthesis (does not work in antlr
@@ -30,7 +30,7 @@ syn clear	javaInParen
 syn clear	javaError2
 
 " remove function definitions (they look different) (first define in
-" in case it was not defined in java.vim)
+" in case it was not defined in java.mnv)
 "syn match javaFuncDef "--"
 "syn clear javaFuncDef
 "syn match javaFuncDef "[a-zA-Z][a-zA-Z0-9_. \[\]]*([^-+*/()]*)[ \t]*:" contains=javaType
@@ -51,4 +51,4 @@ hi def link antlrPackages Statement
 
 let b:current_syntax = "antlr"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/antlr4.vim b/uvim/runtime/syntax/antlr4.mnv
index 33cc865ccc..047f73e7ca 100644
--- a/uvim/runtime/syntax/antlr4.vim
+++ b/uvim/runtime/syntax/antlr4.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ANTLR4, ANother Tool for Language Recognition v4 <www.antlr.org>
 " Maintainer:	Yinzuo Jiang <jiangyinzuo@foxmail.com>
 " Last Change:	2024 July 09
diff --git a/uvim/runtime/syntax/apache.vim b/uvim/runtime/syntax/apache.mnv
index edc650e9df..438fcef2d5 100644
--- a/uvim/runtime/syntax/apache.vim
+++ b/uvim/runtime/syntax/apache.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Apache configuration (httpd.conf, srm.conf, access.conf, .htaccess)
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " License: This file can be redistribued and/or modified under the same terms
-"		as Vim itself.
+"		as MNV itself.
 " Last Change: 2024 Nov 24
-" 2026 Feb 19 by Vim project: Add SSLVHostSNIPolicy
+" 2026 Feb 19 by MNV project: Add SSLVHostSNIPolicy
 " Notes: Last synced with apache-2.4.62, version 1.x is no longer supported
 " TODO: see particular FIXME's scattered through the file
 "		make it really linewise?
diff --git a/uvim/runtime/syntax/apachestyle.vim b/uvim/runtime/syntax/apachestyle.mnv
index bd5c89d30f..752368076e 100644
--- a/uvim/runtime/syntax/apachestyle.vim
+++ b/uvim/runtime/syntax/apachestyle.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Apache-Style configuration files (proftpd.conf/apache.conf/..)
 " Maintainer:	Ben RUBSON <ben.rubson@gmail.com>
 " Former Maintainer:	Christian Hammers <ch@westend.com>
@@ -6,7 +6,7 @@
 "	2017-12-17,ch
 "		correctly detect comments
 "	2001-05-04,ch
-"		adopted Vim 6.0 syntax style
+"		adopted MNV 6.0 syntax style
 "	1999-10-28,ch
 "		initial release
 
@@ -51,4 +51,4 @@ hi def link apTagError	Error
 
 
 let b:current_syntax = "apachestyle"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/apkbuild.vim b/uvim/runtime/syntax/apkbuild.mnv
index f969ff0e2e..44c44a8a56 100644
--- a/uvim/runtime/syntax/apkbuild.vim
+++ b/uvim/runtime/syntax/apkbuild.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	apkbuild
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2024 Dec 22
 
 " quit when a syntax file was already loaded
@@ -8,10 +8,10 @@ if exists("b:current_syntax")
   finish
 endif
 
-" The actual syntax is in sh.vim and controlled by buffer-local variables.
+" The actual syntax is in sh.mnv and controlled by buffer-local variables.
 unlet! b:is_bash b:is_kornshell
 let b:is_sh = 1
 
-runtime! syntax/sh.vim
+runtime! syntax/sh.mnv
 
 let b:current_syntax = 'apkbuild'
diff --git a/uvim/runtime/syntax/aptconf.vim b/uvim/runtime/syntax/aptconf.mnv
index d51e7bdfa9..1d0313a3fb 100644
--- a/uvim/runtime/syntax/aptconf.vim
+++ b/uvim/runtime/syntax/aptconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	APT config file
 " Maintainer:	Yann Amar <quidame@poivron.org>
 " Last Change:	2021 Jul 12
@@ -12,7 +12,7 @@ if !exists("main_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Errors:
 " Catch all that is not overridden by next rules/items:
diff --git a/uvim/runtime/syntax/arch.vim b/uvim/runtime/syntax/arch.mnv
index f9d095e443..7a64acbcb9 100644
--- a/uvim/runtime/syntax/arch.vim
+++ b/uvim/runtime/syntax/arch.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             GNU Arch inventory file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/arduino.vim b/uvim/runtime/syntax/arduino.mnv
index 2f06eb6e64..25528608ff 100644
--- a/uvim/runtime/syntax/arduino.vim
+++ b/uvim/runtime/syntax/arduino.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Arduino
 " Maintainer:  Johannes Hoff <johannes@johanneshoff.com>
 " Last Change: 21 October 2021
-" License:     VIM license (:help license, replace vim by arduino.vim)
+" License:     MNV license (:help license, replace mnv by arduino.mnv)
 
 " Syntax highlighting like in the Arduino IDE
 " Automatically generated by the script available at
-"    https://github.com/johshoff/arduino-vim-syntax
+"    https://github.com/johshoff/arduino-mnv-syntax
 " Using keywords from <arduino>/build/shared/lib/keywords.txt
 " From version: 1.8.16
 
@@ -23,9 +23,9 @@ endif
 
 " Read the C syntax to start with
 if version < 600
-  so <sfile>:p:h/cpp.vim
+  so <sfile>:p:h/cpp.mnv
 else
-  runtime! syntax/cpp.vim
+  runtime! syntax/cpp.mnv
 endif
 
 syn keyword arduinoConstant  BIN CHANGE DEC DEFAULT EXTERNAL FALLING HALF_PI HEX
diff --git a/uvim/runtime/syntax/art.vim b/uvim/runtime/syntax/art.mnv
index 855119810b..8874cf2bfc 100644
--- a/uvim/runtime/syntax/art.vim
+++ b/uvim/runtime/syntax/art.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      ART-IM and ART*Enterprise
 " Maintainer:    Dorai Sitaram <ds26@gte.com>
-" URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
+" URL:		 http://www.ccs.neu.edu/~dorai/mnvplugins/mnvplugins.html
 " Last Change:   2011 Dec 28 by Thilo Six
 
 if exists("b:current_syntax")
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/asciidoc.vim b/uvim/runtime/syntax/asciidoc.mnv
index 29451f9eab..c012bec531 100644
--- a/uvim/runtime/syntax/asciidoc.vim
+++ b/uvim/runtime/syntax/asciidoc.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:        AsciiDoc
 " Maintainer:      @aerostitch on GitHub (tag me in your issue in the
-"                  github/vim/vim repository and I'll answer when available)
+"                  github/mnv/mnv repository and I'll answer when available)
 " Original author: Stuart Rackham <srackham@gmail.com> (inspired by Felix
-"                  Obenhuber's original asciidoc.vim script).
+"                  Obenhuber's original asciidoc.mnv script).
 " URL:             http://asciidoc.org/
 " Licence:         GPL (http://www.gnu.org)
-" Remarks:         Vim 6 or greater
+" Remarks:         MNV 6 or greater
 " Last Update:     2020 May 03 (see Issue 240)
 " Limitations:
 "
@@ -80,7 +80,7 @@ syn match asciidocQuoteBlockDelimiter /^_\{4,}$/
 syn match asciidocExampleBlockDelimiter /^=\{4,}$/
 syn match asciidocSidebarDelimiter /^*\{4,}$/
 
-" See http://vimdoc.sourceforge.net/htmldoc/usr_44.html for excluding region
+" See http://mnvdoc.sourceforge.net/htmldoc/usr_44.html for excluding region
 " contents from highlighting.
 syn match asciidocTablePrefix /\(\S\@<!\(\([0-9.]\+\)\([*+]\)\)\?\([<\^>.]\{,3}\)\?\([a-z]\)\?\)\?|/ containedin=asciidocTableBlock contained
 syn region asciidocTableBlock matchgroup=asciidocTableDelimiter start=/^|=\{3,}$/ end=/^|=\{3,}$/ keepend contains=ALL
@@ -182,4 +182,4 @@ hi def link asciidocTwoLineTitle Title
 hi def link asciidocURL Macro
 let b:current_syntax = "asciidoc"
 
-" vim: wrap et sw=2 sts=2:
+" mnv: wrap et sw=2 sts=2:
diff --git a/uvim/runtime/syntax/asm.vim b/uvim/runtime/syntax/asm.mnv
index 18f3de1c63..bce3ede116 100644
--- a/uvim/runtime/syntax/asm.vim
+++ b/uvim/runtime/syntax/asm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		GNU Assembler
 " Maintainer:		Doug Kearns dougkearns@gmail.com
 " Previous Maintainers: Erik Wognsen <erik.wognsen@gmail.com>
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -164,4 +164,4 @@ let b:current_syntax = "asm"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet
+" mnv: nowrap sw=2 sts=2 ts=8 noet
diff --git a/uvim/runtime/syntax/asm68k.vim b/uvim/runtime/syntax/asm68k.mnv
index 104887d026..3091d3bb1e 100644
--- a/uvim/runtime/syntax/asm68k.vim
+++ b/uvim/runtime/syntax/asm68k.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Motorola 68000 Assembler
 " Maintainer:	Steve Wall
 " Last change:	2001 May 01
@@ -375,4 +375,4 @@ hi def link asm68kLabel		Type
 
 let b:current_syntax = "asm68k"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/asmh8300.vim b/uvim/runtime/syntax/asmh8300.mnv
index 2eabb7e4e5..ffa260d635 100644
--- a/uvim/runtime/syntax/asmh8300.vim
+++ b/uvim/runtime/syntax/asmh8300.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Hitachi H-8300h specific syntax for GNU Assembler
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/asm.vim
+runtime! syntax/asm.mnv
 
 syn case ignore
 
@@ -55,4 +55,4 @@ hi def link asmRegister	Identifier
 
 let b:current_syntax = "asmh8300"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet
+" mnv: nowrap sw=2 sts=2 ts=8 noet
diff --git a/uvim/runtime/syntax/asn.vim b/uvim/runtime/syntax/asn.mnv
index e90c7e079c..226dd3c2cc 100644
--- a/uvim/runtime/syntax/asn.vim
+++ b/uvim/runtime/syntax/asn.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ASN.1
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/asn.vim
+" URL:		http://www.fleiner.com/mnv/syntax/asn.mnv
 " Last Change:	2012 Oct 05
 
 " quit when a syntax file was already loaded
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " keyword definitions
 syn keyword asnExternal		DEFINITIONS BEGIN END IMPORTS EXPORTS FROM
@@ -70,4 +70,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 let b:current_syntax = "asn"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/aspperl.vim b/uvim/runtime/syntax/aspperl.mnv
index 5a9abedb19..563dcb3f90 100644
--- a/uvim/runtime/syntax/aspperl.vim
+++ b/uvim/runtime/syntax/aspperl.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Active State's PerlScript (ASP)
 " Maintainer:	Aaron Hope <edh@brioforge.com>
-" URL:		http://nim.dhs.org/~edh/aspperl.vim
+" URL:		http://nim.dhs.org/~edh/aspperl.mnv
 " Last Change:	2001 May 09
 
 " quit when a syntax file was already loaded
@@ -13,9 +13,9 @@ if !exists("main_syntax")
   let main_syntax = 'perlscript'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
-syn include @AspPerlScript syntax/perl.vim
+syn include @AspPerlScript syntax/perl.mnv
 
 syn cluster htmlPreproc add=AspPerlScriptInsideHtmlTags
 
diff --git a/uvim/runtime/syntax/aspvbs.vim b/uvim/runtime/syntax/aspvbs.mnv
index 44909b651e..b750b82b92 100644
--- a/uvim/runtime/syntax/aspvbs.vim
+++ b/uvim/runtime/syntax/aspvbs.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Microsoft VBScript Web Content (ASP)
 " Maintainer:	Devin Weaver <ktohg@tritarget.com> (non-functional)
-" URL:		http://tritarget.com/pub/vim/syntax/aspvbs.vim (broken)
+" URL:		http://tritarget.com/pub/mnv/syntax/aspvbs.mnv (broken)
 " Last Change:	2006 Jun 19
 " 		by Dan Casey
 " Version:	$Revision: 1.3 $
-" Thanks to Jay-Jay <vim@jay-jay.net> for a syntax sync hack, hungarian
+" Thanks to Jay-Jay <mnv@jay-jay.net> for a syntax sync hack, hungarian
 " notation, and extra highlighting.
 " Thanks to patrick dehne <patrick@steidle.net> for the folding code.
 " Thanks to Dean Hall <hall@apt7.com> for testing the use of classes in
@@ -20,7 +20,7 @@ if !exists("main_syntax")
   let main_syntax = 'aspvbs'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster htmlPreProc add=AspVBScriptInsideHtmlTags
@@ -179,4 +179,4 @@ if main_syntax == 'aspvbs'
   unlet main_syntax
 endif
 
-" vim: ts=8:sw=2:sts=0:noet
+" mnv: ts=8:sw=2:sts=0:noet
diff --git a/uvim/runtime/syntax/asterisk.vim b/uvim/runtime/syntax/asterisk.mnv
index 4b3d246e39..3574e31185 100644
--- a/uvim/runtime/syntax/asterisk.vim
+++ b/uvim/runtime/syntax/asterisk.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Asterisk config file
 " Maintainer: 	Jean Aunis <jean.aunis@yahoo.fr>
 " Previous Maintainer:	brc007
@@ -84,5 +84,5 @@ hi def link        asteriskSetting         Statement
 hi def link        asteriskError           Error
 
 let b:current_syntax = "asterisk" 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
 
diff --git a/uvim/runtime/syntax/asteriskvm.vim b/uvim/runtime/syntax/asteriskvm.mnv
index fa55af5451..36d6135d0f 100644
--- a/uvim/runtime/syntax/asteriskvm.vim
+++ b/uvim/runtime/syntax/asteriskvm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Asterisk voicemail config file
 " Maintainer: Tilghman Lesher (Corydon76)
 " Last Change:	2006 Mar 21
@@ -47,5 +47,5 @@ hi def link        mailboxEmail            String
 
 let b:current_syntax = "asteriskvm"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
 
diff --git a/uvim/runtime/syntax/astro.vim b/uvim/runtime/syntax/astro.mnv
index 0816051ada..75dc0400e8 100644
--- a/uvim/runtime/syntax/astro.vim
+++ b/uvim/runtime/syntax/astro.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file.
+" MNV syntax file.
 " Language:    Astro
 " Author:      Wuelner Martínez <wuelner.martinez@outlook.com>
 " Maintainer:  Wuelner Martínez <wuelner.martinez@outlook.com>
-" URL:         https://github.com/wuelnerdotexe/vim-astro
+" URL:         https://github.com/wuelnerdotexe/mnv-astro
 " Last Change: 2022 Aug 22
-" Based On:    Evan Lecklider's vim-svelte
-" Changes:     See https://github.com/evanleck/vim-svelte
-" Credits:     See vim-svelte on github
+" Based On:    Evan Lecklider's mnv-svelte
+" Changes:     See https://github.com/evanleck/mnv-svelte
+" Credits:     See mnv-svelte on github
 
 " Quit when a (custom) syntax file was already loaded.
 if !exists('main_syntax')
@@ -23,10 +23,10 @@ let g:astro_typescript = get(g:, 'astro_typescript', 'disable')
 let g:astro_stylus = get(g:, 'astro_stylus', 'disable')
 
 let s:cpoptions_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Embedded HTML syntax.
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 
 " htmlTagName: expand HTML tag names to include mixed case and periods.
 syntax match htmlTagName contained "\<[a-zA-Z\.]*\>"
@@ -38,7 +38,7 @@ unlet b:current_syntax
 
 if g:astro_typescript == 'enable'
   " Embedded TypeScript syntax.
-  syntax include @astroJavaScript syntax/typescript.vim
+  syntax include @astroJavaScript syntax/typescript.mnv
 
   " javaScriptExpression: a javascript expression is used as an arg value.
   syntax clear javaScriptExpression
@@ -56,7 +56,7 @@ if g:astro_typescript == 'enable'
         \ contains=htmlScriptTag,@astroJavaScript,@htmlPreproc,htmlCssStyleComment
 else
   " Embedded JavaScript syntax.
-  syntax include @astroJavaScript syntax/javascript.vim
+  syntax include @astroJavaScript syntax/javascript.mnv
 endif
 
 " astroFence: detect the Astro fence.
@@ -74,10 +74,10 @@ unlet b:current_syntax
 
 if g:astro_typescript == 'enable'
   " Embedded TypeScript React (TSX) syntax.
-  syntax include @astroJavaScriptReact syntax/typescriptreact.vim
+  syntax include @astroJavaScriptReact syntax/typescriptreact.mnv
 else
   " Embedded JavaScript React (JSX) syntax.
-  syntax include @astroJavaScriptReact syntax/javascriptreact.vim
+  syntax include @astroJavaScriptReact syntax/javascriptreact.mnv
 endif
 
 " astroJavaScriptExpression: add {JSX or TSX} support to Astro expresions.
@@ -104,7 +104,7 @@ syntax region cssStyle
 unlet b:current_syntax
 
 " Embedded SCSS syntax.
-syntax include @astroScss syntax/scss.vim
+syntax include @astroScss syntax/scss.mnv
 
 " cssStyle: add SCSS style tags support in Astro.
 syntax region scssStyle
@@ -117,7 +117,7 @@ syntax region scssStyle
 unlet b:current_syntax
 
 " Embedded SASS syntax.
-syntax include @astroSass syntax/sass.vim
+syntax include @astroSass syntax/sass.mnv
 
 " cssStyle: add SASS style tags support in Astro.
 syntax region sassStyle
@@ -130,7 +130,7 @@ syntax region sassStyle
 unlet b:current_syntax
 
 " Embedded LESS syntax.
-syntax include @astroLess syntax/less.vim
+syntax include @astroLess syntax/less.mnv
 
 " cssStyle: add LESS style tags support in Astro.
 syntax region lessStyle
@@ -143,12 +143,12 @@ syntax region lessStyle
 unlet b:current_syntax
 
 " Embedded Stylus syntax.
-" NOTE: Vim does not provide stylus support by default, but you can install
-"       this plugin to support it: https://github.com/wavded/vim-stylus
+" NOTE: MNV does not provide stylus support by default, but you can install
+"       this plugin to support it: https://github.com/wavded/mnv-stylus
 if g:astro_stylus == 'enable'
   try
     " Embedded Stylus syntax.
-    syntax include @astroStylus syntax/stylus.vim
+    syntax include @astroStylus syntax/stylus.mnv
 
     " stylusStyle: add Stylus style tags support in Astro.
     syntax region stylusStyle
@@ -187,4 +187,4 @@ syntax sync fromstart
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/asy.vim b/uvim/runtime/syntax/asy.mnv
index de17d925d0..5907195f2d 100644
--- a/uvim/runtime/syntax/asy.vim
+++ b/uvim/runtime/syntax/asy.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Asymptote
 " Maintainer:   Avid Seeker <avidseeker7@protonmail.com>
 "               Andy Hammerlindl
 " Last Change:  2022 Jan 05
-" 2025 Apr 16 by Vim Project (set 'cpoptions' for line continuation, #17121)
+" 2025 Apr 16 by MNV Project (set 'cpoptions' for line continuation, #17121)
 
 " Hacked together from Bram Moolenaar's C syntax file, and Claudio Fleiner's
 " Java syntax file.
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " useful C/C++/Java keywords
 syn keyword     asyStatement     break return continue unravel
diff --git a/uvim/runtime/syntax/atlas.vim b/uvim/runtime/syntax/atlas.mnv
index 1cdceab4ce..0fb99a8f3c 100644
--- a/uvim/runtime/syntax/atlas.vim
+++ b/uvim/runtime/syntax/atlas.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ATLAS
 " Maintainer:	Inaki Saez <jisaez@sfe.indra.es>
 " Last Change:	2001 May 09
@@ -82,4 +82,4 @@ hi def link atlasSpecial		Special
 
 let b:current_syntax = "atlas"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/autodoc.vim b/uvim/runtime/syntax/autodoc.mnv
index 67a627e46c..224dd5255c 100644
--- a/uvim/runtime/syntax/autodoc.vim
+++ b/uvim/runtime/syntax/autodoc.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Autodoc
 " Maintainer:	Stephen R. van den Berg <srb@cuci.nl>
 " Last Change:	2018 Jan 23
 " Version:	2.9
-" Remark:       Included by pike.vim, cmod.vim and optionally c.vim
-" Remark:       In order to make c.vim use it, set: c_autodoc
+" Remark:       Included by pike.mnv, cmod.mnv and optionally c.mnv
+" Remark:       In order to make c.mnv use it, set: c_autodoc
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -98,4 +98,4 @@ let b:current_syntax = "autodoc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/autohotkey.vim b/uvim/runtime/syntax/autohotkey.mnv
index a888394923..2f4bf2f05e 100644
--- a/uvim/runtime/syntax/autohotkey.vim
+++ b/uvim/runtime/syntax/autohotkey.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         AutoHotkey script file
 " Maintainer:       Michael Wong
-"                   https://github.com/mmikeww/autohotkey.vim
+"                   https://github.com/mmikeww/autohotkey.mnv
 " Latest Revision:  2022-07-25
 " Previous Maintainers:       SungHyun Nam <goweol@gmail.com>
 "                             Nikolai Weibull <now@bitwi.se>
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/autoit.vim b/uvim/runtime/syntax/autoit.mnv
index 6b6048aadc..0f54969c47 100644
--- a/uvim/runtime/syntax/autoit.vim
+++ b/uvim/runtime/syntax/autoit.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:	AutoIt v3 (http://www.autoitscript.com/autoit3/)
 " Maintainer:	Jared Breland <jbreland@legroom.net>
 " Authored By:	Riccardo Casini <ric@libero.it>
-" Script URL:	http://www.vim.org/scripts/script.php?script_id=1239
+" Script URL:	http://www.mnv.org/scripts/script.php?script_id=1239
 " ChangeLog:	Please visit the script URL for detailed change information
 " 		Included change from #970.
 
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = "autoit"
 
diff --git a/uvim/runtime/syntax/automake.vim b/uvim/runtime/syntax/automake.mnv
index 2f1ad982c6..ed0076c2ba 100644
--- a/uvim/runtime/syntax/automake.vim
+++ b/uvim/runtime/syntax/automake.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language: automake Makefile.am
-" Maintainer: Debian Vim Maintainers
+" Maintainer: Debian MNV Maintainers
 " Former Maintainer: John Williams <jrw@pobox.com>
 " Last Change: 2023 Jan 16
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/automake.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/automake.mnv
 "
-" XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain
+" XXX This file is in need of a new maintainer, Debian MNV Maintainers maintain
 "     it only because patches have been submitted for it by Debian users and the
 "     former maintainer was MIA (Missing In Action), taking over its
 "     maintenance was thus the only way to include those patches.
@@ -23,7 +23,7 @@ if exists('b:current_syntax')
 endif
 
 " Read the Makefile syntax to start with
-runtime! syntax/make.vim
+runtime! syntax/make.mnv
 
 syn match automakePrimary "^\w\+\(_PROGRAMS\|_LIBRARIES\|_LISP\|_PYTHON\|_JAVA\|_SCRIPTS\|_DATA\|_HEADERS\|_MANS\|_TEXINFOS\|_LTLIBRARIES\)\s*\ze+\=="
 syn match automakePrimary "^TESTS\s*\ze+\=="me=e-1
diff --git a/uvim/runtime/syntax/autopkgtest.vim b/uvim/runtime/syntax/autopkgtest.mnv
index 5dc1b5f6f5..1535ec2835 100644
--- a/uvim/runtime/syntax/autopkgtest.vim
+++ b/uvim/runtime/syntax/autopkgtest.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Debian autopkgtest control files
-" Maintainer:  Debian Vim Maintainers
+" Maintainer:  Debian MNV Maintainers
 " Last Change: 2025 Jul 05
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/autopkgtest.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/autopkgtest.mnv
 "
 " Specification of the autopkgtest format is available at:
 "   https://www.debian.org/doc/debian-policy/autopkgtest.txt
@@ -13,7 +13,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Must call this first, because it will clear other settings
 syn sync clear
@@ -50,7 +50,7 @@ syn keyword autopkgtestDeprecatedRestrictions contained needs-recommends
 syn match autopkgtestFeatures contained 'test-name=[^, ]*\%([, ]*[^, #]\)*,\='
 syn match autopkgtestDepends contained '\%(@builddeps@\|@recommends@\|@\)'
 
-runtime! syntax/shared/debarchitectures.vim
+runtime! syntax/shared/debarchitectures.mnv
 
 syn keyword autopkgtestArchitecture contained any
 exe 'syn keyword autopkgtestArchitecture contained '. join(g:debArchitectureKernelAnyArch)
@@ -92,4 +92,4 @@ let b:current_syntax = 'autopkgtest'
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/ave.vim b/uvim/runtime/syntax/ave.mnv
index e63e7d2c30..5e8245e65d 100644
--- a/uvim/runtime/syntax/ave.vim
+++ b/uvim/runtime/syntax/ave.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Copyright by Jan-Oliver Wagner
 " Language:	avenue
 " Maintainer:	Jan-Oliver Wagner <Jan-Oliver.Wagner@intevation.de>
@@ -6,7 +6,7 @@
 
 " Avenue is the ArcView built-in language. ArcView is
 " a desktop GIS by ESRI. Though it is a built-in language
-" and a built-in editor is provided, the use of VIM increases
+" and a built-in editor is provided, the use of MNV increases
 " development speed.
 " I use some technologies to automatically load avenue scripts
 " into ArcView.
diff --git a/uvim/runtime/syntax/avra.vim b/uvim/runtime/syntax/avra.mnv
index 0e02bd8397..6d24362948 100644
--- a/uvim/runtime/syntax/avra.vim
+++ b/uvim/runtime/syntax/avra.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     AVR Assembler (AVRA)
 " AVRA Home:    http://avra.sourceforge.net/index.html
 " AVRA Version: 1.3.0
@@ -6,7 +6,7 @@
 " Maintainer:	  Marius Ghita <mhitza@gmail.com>
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/awk.vim b/uvim/runtime/syntax/awk.mnv
index 4e7c0d1e72..9be38739f8 100644
--- a/uvim/runtime/syntax/awk.vim
+++ b/uvim/runtime/syntax/awk.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		awk, nawk, gawk, mawk
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Antonio Colombo <azc100@gmail.com>
@@ -26,7 +26,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,_,192-255,@-@
 
@@ -214,4 +214,4 @@ let b:current_syntax = "awk"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/ayacc.vim b/uvim/runtime/syntax/ayacc.mnv
index 6fb6aec85d..949debc947 100644
--- a/uvim/runtime/syntax/ayacc.vim
+++ b/uvim/runtime/syntax/ayacc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	AYacc
 " Maintainer:	Mathieu Clabaut <mathieu.clabaut@free.fr>
 " LastChange:	2011 Dec 25
 " Original:	Yacc, maintained by Dr. Charles E. Campbell, Jr.
-" Comment:	     Replaced sourcing c.vim file by ada.vim and rename yacc*
+" Comment:	     Replaced sourcing c.mnv file by ada.mnv and rename yacc*
 "		in ayacc*
 
 " quit when a syntax file was already loaded
@@ -12,11 +12,11 @@ if exists("b:current_syntax")
 endif
 
 " Read the Ada syntax to start with
-runtime! syntax/ada.vim
+runtime! syntax/ada.mnv
 unlet b:current_syntax
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Clusters
 syn cluster	ayaccActionGroup	contains=ayaccDelim,cInParen,cTodo,cIncluded,ayaccDelim,ayaccCurlyError,ayaccUnionCurly,ayaccUnion,cUserLabel,cOctalZero,cCppOut2,cCppSkip,cErrInBracket,cErrInParen,cOctalError
@@ -72,4 +72,4 @@ let b:current_syntax = "ayacc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=15
+" mnv: ts=15
diff --git a/uvim/runtime/syntax/b.vim b/uvim/runtime/syntax/b.mnv
index 01532be75d..3df16c2df6 100644
--- a/uvim/runtime/syntax/b.vim
+++ b/uvim/runtime/syntax/b.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	B (A Formal Method with refinement and mathematical proof)
 " Maintainer:	Mathieu Clabaut <mathieu.clabaut@gmail.com>
 " Contributor:  Csaba Hoch
@@ -111,4 +111,4 @@ hi def link bTodo		Todo
 
 let b:current_syntax = "b"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/baan.vim b/uvim/runtime/syntax/baan.mnv
index 9a42a43918..3f3e0ff01e 100644
--- a/uvim/runtime/syntax/baan.vim
+++ b/uvim/runtime/syntax/baan.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file"
+" MNV syntax file"
 " Language:	Baan
 " Maintainer:	Erik Remmelzwaal (erik.remmelzwaal 0x40 ssaglobal.com)
 " Originally owned by: Erwin Smit / Her van de Vliert
@@ -1000,7 +1000,7 @@ syn match  baanNumber		"\<\-\=\d\+\.\d*\>"
 "number starting with a dot"
 syn match  baanNumber		"\<\-\=\.\d\+\>"
 
-" String Error does not work correct with vim 6.0
+" String Error does not work correct with mnv 6.0
 syn match   baanOpenStringError +^[^^"]+ display contained excludenl
 syn region  baanString	start=+"+  skip=+""+  end=+"+ end=+^[^^]+ contains=baanOpenStringError keepend
 
@@ -1914,4 +1914,4 @@ hi def link baanStorageClass	StorageClass
 
 let b:current_syntax = "baan"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/bash.vim b/uvim/runtime/syntax/bash.mnv
index 1e565c3022..f56024a121 100644
--- a/uvim/runtime/syntax/bash.vim
+++ b/uvim/runtime/syntax/bash.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	bash
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 13
 
 " quit when a syntax file was already loaded
@@ -8,13 +8,13 @@ if exists("b:current_syntax")
   finish
 endif
 
-" The actual syntax is in sh.vim and controlled by buffer-local variables.
+" The actual syntax is in sh.mnv and controlled by buffer-local variables.
 unlet! b:is_sh
 unlet! b:is_kornshell
 let b:is_bash = 1
 
-runtime! syntax/sh.vim
+runtime! syntax/sh.mnv
 
 let b:current_syntax = 'bash'
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/basic.vim b/uvim/runtime/syntax/basic.mnv
index b6bf23a3ed..96698875f5 100644
--- a/uvim/runtime/syntax/basic.vim
+++ b/uvim/runtime/syntax/basic.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		BASIC (QuickBASIC 4.5)
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
@@ -17,7 +17,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,.,!,#,%,&,$
 syn case      ignore
@@ -377,4 +377,4 @@ let b:current_syntax = "basic"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/bc.vim b/uvim/runtime/syntax/bc.mnv
index 4cd9d6388a..50e24afa77 100644
--- a/uvim/runtime/syntax/bc.vim
+++ b/uvim/runtime/syntax/bc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	bc - An arbitrary precision calculator language
 " Maintainer:	Vladimir Scholtz <vlado@gjh.sk>
 " Last change:	2012 Jun 01
 " 		(Dominique Pelle added @Spell)
-" Available on:	www.gjh.sk/~vlado/bc.vim
+" Available on:	www.gjh.sk/~vlado/bc.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -63,4 +63,4 @@ hi def link bcParenError		Error
 
 
 let b:current_syntax = "bc"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/bdf.vim b/uvim/runtime/syntax/bdf.mnv
index cc1a337569..979020da42 100644
--- a/uvim/runtime/syntax/bdf.vim
+++ b/uvim/runtime/syntax/bdf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             BDF font definition
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region  bdfFontDefinition transparent matchgroup=bdfKeyword
                               \ start='^STARTFONT\>' end='^ENDFONT\>'
diff --git a/uvim/runtime/syntax/bib.vim b/uvim/runtime/syntax/bib.mnv
index ac8dcda678..e1649faee5 100644
--- a/uvim/runtime/syntax/bib.vim
+++ b/uvim/runtime/syntax/bib.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	BibTeX (bibliographic database format for (La)TeX)
 " Maintainer:	Bernd Feige <Bernd.Feige@gmx.net>
 " Filenames:	*.bib
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Ignore case
 syn case ignore
@@ -87,7 +87,7 @@ syn region bibBrace contained start=/{/ end=/}/ skip=/\(\\[{}]\)/ contains=@bibV
 syn region bibParen contained start=/(/ end=/)/ skip=/\(\\[()]\)/ contains=@bibVarContents
 syn region bibField contained start="\S\+\s*=\s*" end=/[}),]/me=e-1 contains=bibEntryKw,bibNSEntryKw,bibBrace,bibParen,bibQuote,bibVariable
 syn region bibEntryData contained start=/[{(]/ms=e+1 end=/[})]/me=e-1 contains=bibKey,bibField,bibComment3
-" Actually, 5.8 <= Vim < 6.0 would ignore the `fold' keyword anyway, but Vim<5.8 would produce
+" Actually, 5.8 <= MNV < 6.0 would ignore the `fold' keyword anyway, but MNV<5.8 would produce
 " an error, so we explicitly distinguish versions with and without folding functionality:
 syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent fold contains=bibType,bibEntryData nextgroup=bibComment
 syn region bibComment2 start=/@Comment\s*[{(]/ end=/^\s*[})]/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
diff --git a/uvim/runtime/syntax/bindzone.vim b/uvim/runtime/syntax/bindzone.mnv
index dce9974903..8e4ffaff78 100644
--- a/uvim/runtime/syntax/bindzone.vim
+++ b/uvim/runtime/syntax/bindzone.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     BIND zone files (RFC 1035)
 " Maintainer:   Julian Mehnle <julian@mehnle.net>
-" URL:          http://www.mehnle.net/source/odds+ends/vim/syntax/
+" URL:          http://www.mehnle.net/source/odds+ends/mnv/syntax/
 " Last Change:  Thu 2011-07-16 20:42:00 UTC
 " 
 " Based on an earlier version by Вячеслав Горбанев (Slava Gorbanev), with
 " heavy modifications.
 " 
-" $Id: bindzone.vim 12 2011-07-16 21:09:57Z julian $
+" $Id: bindzone.mnv 12 2011-07-16 21:09:57Z julian $
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -94,4 +94,4 @@ hi def link zoneComment      Comment
 
 let b:current_syntax = "bindzone"
 
-" vim:sts=2 sw=2
+" mnv:sts=2 sw=2
diff --git a/uvim/runtime/syntax/bitbake.vim b/uvim/runtime/syntax/bitbake.mnv
index 5e9bc58290..ca6094fe70 100644
--- a/uvim/runtime/syntax/bitbake.vim
+++ b/uvim/runtime/syntax/bitbake.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     BitBake bb/bbclasses/inc
 " Author:       Chris Larson <kergoth@handhelds.org>
 "               Ricardo Salveti <rsalveti@rsalveti.net>
 " Copyright:    Copyright (C) 2004  Chris Larson <kergoth@handhelds.org>
 "               Copyright (C) 2008  Ricardo Salveti <rsalveti@rsalveti.net>
 " Last Change:  2022 Jul 25
-" 2025 Oct 13 by Vim project: update multiline function syntax #18565
+" 2025 Oct 13 by MNV project: update multiline function syntax #18565
 "
 " This file is licensed under the MIT license, see COPYING.MIT in
 " this source distribution for the terms.
@@ -21,7 +21,7 @@ if exists("b:current_syntax")
     finish
 endif
 
-syn include @python syntax/python.vim
+syn include @python syntax/python.mnv
 unlet! b:current_syntax
 
 " BitBake syntax
@@ -80,7 +80,7 @@ syn match bbFunction            "\h[0-9A-Za-z_\-\.]*" display contained contains
 syn keyword bbOverrideOperator  append prepend remove contained
 
 " BitBake shell metadata
-syn include @shell syntax/sh.vim
+syn include @shell syntax/sh.mnv
 unlet! b:current_syntax
 
 syn keyword bbShFakeRootFlag    fakeroot contained
diff --git a/uvim/runtime/syntax/blank.vim b/uvim/runtime/syntax/blank.mnv
index 6d2e3fd7bd..d089229122 100644
--- a/uvim/runtime/syntax/blank.vim
+++ b/uvim/runtime/syntax/blank.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Blank 1.4.1
 " Maintainer:   Rafal M. Sulejman <unefunge@friko2.onet.pl>
 " Last change:  2011 Dec 28 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -36,4 +36,4 @@ let b:current_syntax = "blank"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/bpftrace.vim b/uvim/runtime/syntax/bpftrace.mnv
index 4e23bcbde5..a5b362c230 100644
--- a/uvim/runtime/syntax/bpftrace.vim
+++ b/uvim/runtime/syntax/bpftrace.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		bpftrace
 " Maintainer:		Stanislaw Gruszka <stf_xl@wp.pl>
 " Last Change:		2025 Dec 22
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword	bpftraceConditional	if else
 syn keyword	bpftraceRepeat		while for unroll
@@ -63,4 +63,4 @@ let b:current_syntax = "bpftrace"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=8 noexpandtab
+" mnv: ts=8 sw=8 noexpandtab
diff --git a/uvim/runtime/syntax/bsdl.vim b/uvim/runtime/syntax/bsdl.mnv
index 75c69558e5..316e22511c 100644
--- a/uvim/runtime/syntax/bsdl.vim
+++ b/uvim/runtime/syntax/bsdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Boundary Scan Description Language (BSDL)
 " Maintainer:	Daniel Kho <daniel.kho@logik.haus>
 " Last Changed:	2020 Mar 19 by Daniel Kho
@@ -9,9 +9,9 @@ if exists("b:current_syntax")
 endif
 
 " Read in VHDL syntax files
-runtime! syntax/vhdl.vim
+runtime! syntax/vhdl.mnv
 unlet b:current_syntax
 
 let b:current_syntax = "bsdl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/bst.vim b/uvim/runtime/syntax/bst.mnv
index 5ebef16460..373b4cc356 100644
--- a/uvim/runtime/syntax/bst.vim
+++ b/uvim/runtime/syntax/bst.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     BibTeX Bibliography Style
-" Maintainer:   Tim Pope <vimNOSPAM@tpope.info>
+" Maintainer:   Tim Pope <mnvNOSPAM@tpope.info>
 " Filenames:    *.bst
-" $Id: bst.vim,v 1.2 2007/05/05 18:24:42 vimboss Exp $
+" $Id: bst.mnv,v 1.2 2007/05/05 18:24:42 mnvboss Exp $
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -67,4 +67,4 @@ hi def link bstError             Error
 
 let b:current_syntax = "bst"
 
-" vim:set ft=vim sts=4 sw=4:
+" mnv:set ft=mnv sts=4 sw=4:
diff --git a/uvim/runtime/syntax/btm.vim b/uvim/runtime/syntax/btm.mnv
index 4f9253ff9f..c80afe5703 100644
--- a/uvim/runtime/syntax/btm.vim
+++ b/uvim/runtime/syntax/btm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	4Dos batch file
 " Maintainer:	John Leo Spetz <jls11@po.cwru.edu>
 " Last Change:	2001 May 09
@@ -213,4 +213,4 @@ hi def link btmCommand		btmStatement
 
 let b:current_syntax = "btm"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/bzl.vim b/uvim/runtime/syntax/bzl.mnv
index b0ee9454ff..c85417c471 100644
--- a/uvim/runtime/syntax/bzl.vim
+++ b/uvim/runtime/syntax/bzl.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Bazel (http://bazel.io)
-" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Maintainer:	David Barnett (https://github.com/google/mnv-ft-bzl)
 " Last Change:	2015 Aug 11
 
 if exists('b:current_syntax')
@@ -8,7 +8,7 @@ if exists('b:current_syntax')
 endif
 
 
-runtime! syntax/python.vim
+runtime! syntax/python.mnv
 
 let b:current_syntax = 'bzl'
 
diff --git a/uvim/runtime/syntax/bzr.vim b/uvim/runtime/syntax/bzr.mnv
index 43178b8a1a..31d5557f39 100644
--- a/uvim/runtime/syntax/bzr.vim
+++ b/uvim/runtime/syntax/bzr.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Bazaar (bzr) commit file
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
-" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/bzr.vim
+" URL:          https://github.com/hdima/mnv-scripts/blob/master/syntax/bzr.mnv
 " Last Change:  2012-02-11
 " Filenames:    bzr_log.*
 " Version:      1.2.2
@@ -17,7 +17,7 @@ if exists("b:current_syntax")
 endif
 
 if exists("bzr_highlight_diff")
-  syn include @Diff syntax/diff.vim
+  syn include @Diff syntax/diff.mnv
 endif
 
 syn match bzrRemoved   "^removed:$" contained
diff --git a/uvim/runtime/syntax/c.vim b/uvim/runtime/syntax/c.mnv
index 64bcd3e368..982f5acb9e 100644
--- a/uvim/runtime/syntax/c.vim
+++ b/uvim/runtime/syntax/c.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		C
-" Maintainer:		The Vim Project <https://github.com/vim/vim>
+" Maintainer:		The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:		2026 Jan 13
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,18 +10,18 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let s:ft = matchstr(&ft, '^\%([^.]\)\+')
 
-" check if this was included from cpp.vim
+" check if this was included from cpp.mnv
 let s:in_cpp_family = exists("b:filetype_in_cpp_family")
 
 " Optional embedded Autodoc parsing
 " To enable it add: let g:c_autodoc = 1
-" to your .vimrc
+" to your .mnvrc
 if exists("c_autodoc")
-  syn include @cAutodoc <sfile>:p:h/autodoc.vim
+  syn include @cAutodoc <sfile>:p:h/autodoc.mnv
   unlet b:current_syntax
 endif
 
@@ -206,7 +206,7 @@ syn match	cNumbers	display transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOct
 " Same, but without octal error (for comments)
 syn match	cNumbersCom	display contained transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOctal
 
-" cpp.vim handles these
+" cpp.mnv handles these
 if !exists("c_no_c23") && !s:in_cpp_family
   syn match	cNumber		display contained "\d\%('\=\d\+\)*\%(u\=l\{0,2}\|ll\=u\|u\=wb\|wbu\=\)\>"
   "hex number
@@ -639,4 +639,4 @@ unlet s:ft
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cabal.vim b/uvim/runtime/syntax/cabal.mnv
index 74cda51266..49a320a0e9 100644
--- a/uvim/runtime/syntax/cabal.vim
+++ b/uvim/runtime/syntax/cabal.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Haskell Cabal Build file
 " Author:	Vincent Berthoux <twinside@gmail.com>
 " Maintainer:   Marcin Szamotulski <profunctor@pm.me>
@@ -8,7 +8,7 @@
 " v1.6: Added support for foreign-libraries
 "       Added highlighting for various fields 
 " v1.5: Incorporated changes from
-"       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
+"       https://github.com/sdiehl/haskell-mnv-proto/blob/master/mnv/syntax/cabal.mnv
 "       Use `syn keyword` instead of `syn match`.
 "       Added cabalStatementRegion to limit matches of keywords, which fixes
 "       the highlighting of description's value.
@@ -31,7 +31,7 @@
 " v1.1: Fixed operator problems and added ftdetect file
 "       (thanks to Sebastian Schwarz)
 "
-" v1.0: Cabal syntax in vimball format
+" v1.0: Cabal syntax in mnvball format
 "       (thanks to Magnus Therning)
 
 " quit when a syntax file was already loaded
@@ -41,7 +41,7 @@ endif
 
 " this file uses line continuation
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " set iskeyword for this syntax script
 syn iskeyword @,48-57,192-255,-
@@ -275,4 +275,4 @@ let b:current_syntax = "cabal"
 let &cpo = s:cpo_save
 unlet! s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cabalconfig.vim b/uvim/runtime/syntax/cabalconfig.mnv
index 0165725c06..8f806da463 100644
--- a/uvim/runtime/syntax/cabalconfig.vim
+++ b/uvim/runtime/syntax/cabalconfig.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Cabal Config
 " Maintainer:		profunctor@pm.me
 " Last Change:		Marcin Szamotulski
diff --git a/uvim/runtime/syntax/cabalproject.vim b/uvim/runtime/syntax/cabalproject.mnv
index 12143b9ee9..84408cc61b 100644
--- a/uvim/runtime/syntax/cabalproject.vim
+++ b/uvim/runtime/syntax/cabalproject.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Cabal Project
 " Maintainer:		profunctor@pm.me
 " Last Change:		Marcin Szamotulski
diff --git a/uvim/runtime/syntax/calendar.vim b/uvim/runtime/syntax/calendar.mnv
index 4250109019..2e581c7271 100644
--- a/uvim/runtime/syntax/calendar.vim
+++ b/uvim/runtime/syntax/calendar.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             calendar(1) input file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword calendarTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/cangjie.vim b/uvim/runtime/syntax/cangjie.mnv
index d8194a9274..99f063bb25 100644
--- a/uvim/runtime/syntax/cangjie.vim
+++ b/uvim/runtime/syntax/cangjie.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Cangjie
 " Maintainer: Wu Junkai <wu.junkai@qq.com>
-" URL: https://github.com/WuJunkai2004/cangjie.vim
+" URL: https://github.com/WuJunkai2004/cangjie.mnv
 " Last Change: 2026 Jan 5
 "
 " The Cangjie programming language is a new-generation programming
@@ -22,7 +22,7 @@ if exists("b:current_syntax")
 endif
 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " 0. check the user's settings
 " use let g:cangjie_<item>_color to enable/disable syntax highlighting
@@ -222,4 +222,4 @@ let b:current_syntax = "cangjie"
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: ts=8 sw=8 noet
+" mnv: ts=8 sw=8 noet
diff --git a/uvim/runtime/syntax/catalog.vim b/uvim/runtime/syntax/catalog.mnv
index 0a1d511a64..2ba36b779a 100644
--- a/uvim/runtime/syntax/catalog.vim
+++ b/uvim/runtime/syntax/catalog.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	sgml catalog file
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Fr, 04 Nov 2005 12:46:45 CET
 " Filenames:	/etc/sgml.catalog
-" $Id: catalog.vim,v 1.2 2005/11/23 21:11:10 vimboss Exp $
+" $Id: catalog.mnv,v 1.2 2005/11/23 21:11:10 mnvboss Exp $
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/cdl.vim b/uvim/runtime/syntax/cdl.mnv
index 2a458d4ada..7242dcee1c 100644
--- a/uvim/runtime/syntax/cdl.vim
+++ b/uvim/runtime/syntax/cdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Comshare Dimension Definition Language
 " Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
 " Last change:	2016 Sep 20
@@ -75,4 +75,4 @@ hi def link cdlConditional	Conditional
 
 let b:current_syntax = "cdl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cdrdaoconf.vim b/uvim/runtime/syntax/cdrdaoconf.mnv
index 0fa65103fb..1b7fafee83 100644
--- a/uvim/runtime/syntax/cdrdaoconf.vim
+++ b/uvim/runtime/syntax/cdrdaoconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             cdrdao(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-09-02
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword cdrdaoconfTodo
       \ TODO FIXME XXX NOTE
diff --git a/uvim/runtime/syntax/cdrtoc.vim b/uvim/runtime/syntax/cdrtoc.mnv
index 866784d7c2..196efb07d0 100644
--- a/uvim/runtime/syntax/cdrtoc.vim
+++ b/uvim/runtime/syntax/cdrtoc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             cdrdao(1) TOC file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-05-10
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword cdrtocTodo
       \ contained
diff --git a/uvim/runtime/syntax/cf.vim b/uvim/runtime/syntax/cf.mnv
index 04f9f5967b..f4e560931f 100644
--- a/uvim/runtime/syntax/cf.vim
+++ b/uvim/runtime/syntax/cf.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:     CFML (ColdFusion)
 " Author:       Ernst M. van der Linden <ernst.vanderlinden@ernestoz.com>
 " License:      The MIT License (MIT)
 "
 " Maintainer:   Ernst M. van der Linden <ernst.vanderlinden@ernestoz.com>
-" URL:          https://github.com/ernstvanderlinden/vim-coldfusion
+" URL:          https://github.com/ernstvanderlinden/mnv-coldfusion
 " Last Change:  2017 Nov 28
 "
 " Filenames:    *.cfc *.cfm
@@ -25,11 +25,11 @@ sy sync fromstart
 sy case ignore
 
 " INCLUDES {{{
-sy include @sqlSyntax $VIMRUNTIME/syntax/sql.vim
+sy include @sqlSyntax $MNVRUNTIME/syntax/sql.mnv
 " 20161010: Disabled include html highlighting as it contains huge keywords
 " regex, so it will have impact on performance.  Use own simple SGML tag
 " coloring instead.
-"runtime! syntax/html.vim
+"runtime! syntax/html.mnv
 " / INCLUDES }}}
 
 " NUMBER {{{
diff --git a/uvim/runtime/syntax/cfg.vim b/uvim/runtime/syntax/cfg.mnv
index 69788760cc..0039a71365 100644
--- a/uvim/runtime/syntax/cfg.vim
+++ b/uvim/runtime/syntax/cfg.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Good old CFG files
 " Maintainer:	Igor N. Prischepoff (igor@tyumbit.ru, pri_igor@mail.ru)
 " Last Change:	2012 Aug 11
-" 2024 Nov 14 by Vim project:  // only denotes a comment when starting a line (#16051)
+" 2024 Nov 14 by MNV project:  // only denotes a comment when starting a line (#16051)
 
 " quit when a syntax file was already loaded
 if exists ("b:current_syntax")
@@ -46,4 +46,4 @@ hi def link UncPath      Directory
 
 
 let b:current_syntax = "cfg"
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/cgdbrc.vim b/uvim/runtime/syntax/cgdbrc.mnv
index 1ace370d8c..a6d4ad7d4b 100644
--- a/uvim/runtime/syntax/cgdbrc.vim
+++ b/uvim/runtime/syntax/cgdbrc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             cgdbrc
 " Maintainer:           Wu, Zhenyu <wuzhenyu@ustc.edu>
 " Documentation:        https://cgdb.github.io/docs/Configuring-CGDB.html
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 let b:current_syntax = 'cgdbrc'
 
-runtime! syntax/vim.vim
+runtime! syntax/mnv.mnv
 
 syn region cgdbComment		start="^\s*\#" skip="\\$" end="$" contains=@Spell
 
diff --git a/uvim/runtime/syntax/ch.vim b/uvim/runtime/syntax/ch.mnv
index 61f475bc99..e7c2e9c6a4 100644
--- a/uvim/runtime/syntax/ch.vim
+++ b/uvim/runtime/syntax/ch.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Ch
 " Maintainer:   SoftIntegration, Inc. <info@softintegration.com>
-" URL:		http://www.softintegration.com/download/vim/syntax/ch.vim
+" URL:		http://www.softintegration.com/download/mnv/syntax/ch.mnv
 " Last change:	2004 Sep 01
-"		Created based on cpp.vim
+"		Created based on cpp.mnv
 "
 " Ch is a C/C++ interpreter with many high level extensions
 "
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 
 " Ch extentions
@@ -35,4 +35,4 @@ hi def link chStructure		Structure
 
 let b:current_syntax = "ch"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/chaiscript.vim b/uvim/runtime/syntax/chaiscript.mnv
index 9925ba5138..0d3ca5d0d2 100644
--- a/uvim/runtime/syntax/chaiscript.vim
+++ b/uvim/runtime/syntax/chaiscript.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ChaiScript
 " Maintainer:	Jason Turner <lefticus 'at' gmail com>
 
@@ -91,4 +91,4 @@ hi def link chaiscriptEval	        Special
 
 let b:current_syntax = "chaiscript"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet
+" mnv: nowrap sw=2 sts=2 ts=8 noet
diff --git a/uvim/runtime/syntax/change.vim b/uvim/runtime/syntax/change.mnv
index a92767e903..2e3cba8915 100644
--- a/uvim/runtime/syntax/change.vim
+++ b/uvim/runtime/syntax/change.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	WEB Changes
 " Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
 " Last Change:	April 25, 2001
 
 " Details of the change mechanism of the WEB and CWEB languages can be found
-" in the articles by Donald E. Knuth and Silvio Levy cited in "web.vim" and
-" "cweb.vim" respectively.
+" in the articles by Donald E. Knuth and Silvio Levy cited in "web.mnv" and
+" "cweb.mnv" respectively.
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -26,4 +26,4 @@ hi def link changeToMaterial Statement
 
 let b:current_syntax = "change"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/changelog.vim b/uvim/runtime/syntax/changelog.mnv
index cf9021ef05..03d4cee103 100644
--- a/uvim/runtime/syntax/changelog.vim
+++ b/uvim/runtime/syntax/changelog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	generic ChangeLog file
 " Written By:	Gediminas Paulauskas <menesis@delfi.lt>
 " Maintainer:	Corinna Vinschen <vinschen@redhat.com>
@@ -55,4 +55,4 @@ hi def link changelogError		Folded
 
 let b:current_syntax = "changelog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/chaskell.vim b/uvim/runtime/syntax/chaskell.mnv
index 4b1e8c53be..318444b8eb 100644
--- a/uvim/runtime/syntax/chaskell.vim
+++ b/uvim/runtime/syntax/chaskell.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Haskell supporting c2hs binding hooks
 " Maintainer:	Armin Sander <armin@mindwalker.org>
 " Last Change:	2001 November 1
 "
-" 2001 November 1: Changed commands for sourcing haskell.vim
+" 2001 November 1: Changed commands for sourcing haskell.mnv
 
 " Enable binding hooks
 let b:hs_chs=1
 
 " Include standard Haskell highlighting
-runtime! syntax/haskell.vim
+runtime! syntax/haskell.mnv
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/chatito.vim b/uvim/runtime/syntax/chatito.mnv
index d89307cf06..31d061a157 100644
--- a/uvim/runtime/syntax/chatito.vim
+++ b/uvim/runtime/syntax/chatito.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Chatito
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.chatito
diff --git a/uvim/runtime/syntax/cheetah.vim b/uvim/runtime/syntax/cheetah.mnv
index 9567ecbbca..b5ca383531 100644
--- a/uvim/runtime/syntax/cheetah.vim
+++ b/uvim/runtime/syntax/cheetah.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Cheetah template engine
 " Maintainer:	Max Ischenko <mfi@ukr.net>
 " Last Change: 2003-05-11
diff --git a/uvim/runtime/syntax/chicken.vim b/uvim/runtime/syntax/chicken.mnv
index 958fc1f361..d3dd43f853 100644
--- a/uvim/runtime/syntax/chicken.vim
+++ b/uvim/runtime/syntax/chicken.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Scheme (CHICKEN)
 " Last Change: 2024 Jun 21
 " Author:      Evan Hanson <evhan@foldling.org>
 " Maintainer:  Evan Hanson <evhan@foldling.org>
-" Repository:  https://git.foldling.org/vim-scheme.git
-" URL:         https://foldling.org/vim/syntax/chicken.vim
+" Repository:  https://git.foldling.org/mnv-scheme.git
+" URL:         https://foldling.org/mnv/syntax/chicken.mnv
 " Notes:       This is supplemental syntax, to be loaded after the core
-"              Scheme syntax file (syntax/scheme.vim). Enable it by
+"              Scheme syntax file (syntax/scheme.mnv). Enable it by
 "              setting b:is_chicken=1 and filetype=scheme.
 
 " Only to be used on top of the Scheme syntax.
@@ -31,7 +31,7 @@ syn match schemeKeyword /#[!:][a-zA-Z0-9!$%&*+-./:<=>?@^_~#]\+/
 syn match schemeKeyword /[a-zA-Z0-9!$%&*+-./:<=>?@^_~#]\+:\>/
 
 " C/C++ syntax.
-let s:c = globpath(&rtp, 'syntax/cpp.vim', 0, 1)
+let s:c = globpath(&rtp, 'syntax/cpp.mnv', 0, 1)
 if len(s:c)
   exe 'syn include @c ' s:c[0]
   syn region c matchgroup=schemeComment start=/#>/ end=/<#/ contains=@c
diff --git a/uvim/runtime/syntax/chill.vim b/uvim/runtime/syntax/chill.mnv
index b95df68bc8..794f992352 100644
--- a/uvim/runtime/syntax/chill.vim
+++ b/uvim/runtime/syntax/chill.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CHILL
 " Maintainer:	YoungSang Yoon <image@lgic.co.kr>
 " Last change:	2004 Jan 21
@@ -175,4 +175,4 @@ hi def link chillBracket	Delimiter
 
 let b:current_syntax = "chill"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/chordpro.vim b/uvim/runtime/syntax/chordpro.mnv
index 02c34b8466..f58c838539 100644
--- a/uvim/runtime/syntax/chordpro.vim
+++ b/uvim/runtime/syntax/chordpro.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     ChordPro 6 (https://www.chordpro.org)
 " Maintainer:   Niels Bo Andersen <niels@niboan.dk>
 " Last Change:  2022-04-15
-" 2024 Dec 31:  add "keys" as syntax keyword (via: https://groups.google.com/g/vim_dev/c/vP4epus0euM/m/mNoDY6hsCQAJ)
+" 2024 Dec 31:  add "keys" as syntax keyword (via: https://groups.google.com/g/mnv_dev/c/vP4epus0euM/m/mNoDY6hsCQAJ)
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,12 +10,12 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
 " Include embedded abc syntax
-syn include @Abc syntax/abc.vim
+syn include @Abc syntax/abc.mnv
 
 " Lilypond and Pango syntaxes could be embedded as well, but they are not
 " available in the distribution.
diff --git a/uvim/runtime/syntax/chuck.vim b/uvim/runtime/syntax/chuck.mnv
index 6fcf40ca8b..a58556f458 100644
--- a/uvim/runtime/syntax/chuck.vim
+++ b/uvim/runtime/syntax/chuck.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: ChucK
 " Maintainer: Andrea Callea
-" URL: https://github.com/gacallea/chuck.vim
+" URL: https://github.com/gacallea/chuck.mnv
 " Last Change: 2024 Jan 21 by Andrea Callea
 
 " Sources used for this syntax
@@ -143,7 +143,7 @@ syn keyword chuckInputOutput MidiIn MidiOut MidiMsg MidiFileIn
 " https://chuck.cs.princeton.edu/doc/reference/
 syn keyword chuckUtilities CKDoc StringTokenizer ConsoleInput
 
-" https://github.com/wilsaj/chuck.vim/blob/master/syntax/chuck.vim
+" https://github.com/wilsaj/chuck.mnv/blob/master/syntax/chuck.mnv
 syn match chuckNumber /\%(\i\|\$\)\@<![-]\?\d\+/ display
 syn match chuckHex /\<0[xX]\x\+[lL]\=\>/ display
 syn match chuckFloat /\%(\i\|\$\)\@<![-]\?\%(\d*\.\d\+\|\d\+\.\)/ display
diff --git a/uvim/runtime/syntax/cl.vim b/uvim/runtime/syntax/cl.mnv
index b765682547..e75de5d739 100644
--- a/uvim/runtime/syntax/cl.vim
+++ b/uvim/runtime/syntax/cl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		CL
 " 			(pronounced alphabetically: "Cee-El".
 " 			CL stands for Clever Language,
@@ -95,4 +95,4 @@ hi def link clStatement	Statement
 
 let b:current_syntax = "cl"
 
-" vim: ts=8 sw=8
+" mnv: ts=8 sw=8
diff --git a/uvim/runtime/syntax/clean.vim b/uvim/runtime/syntax/clean.mnv
index 70bf654fb7..31ecaaf4e2 100644
--- a/uvim/runtime/syntax/clean.vim
+++ b/uvim/runtime/syntax/clean.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Clean
 " Author:		Pieter van Engelen <pietere@sci.kun.nl>
 " Co-Author:	Arthur van Leeuwen <arthurvl@sci.kun.nl>
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Some Clean-keywords
 syn keyword cleanConditional if case
@@ -87,4 +87,4 @@ let b:current_syntax = "clean"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/clipper.vim b/uvim/runtime/syntax/clipper.mnv
index 203f9f05e0..b9cb1f404a 100644
--- a/uvim/runtime/syntax/clipper.vim
+++ b/uvim/runtime/syntax/clipper.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file:
+" MNV syntax file:
 " Language:	Clipper 5.2 & FlagShip
 " Maintainer:	C R Zamana <zamana@zip.net>
-" Some things based on c.vim by Bram Moolenaar and pascal.vim by Mario Eusebio
+" Some things based on c.mnv by Bram Moolenaar and pascal.mnv by Mario Eusebio
 " Last Change:	2011 Dec 29 by Thilo Six
 
 " quit when a syntax file was already loaded
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Exceptions for my "Very Own" (TM) user variables naming style.
 " If you don't like this, comment it
@@ -132,4 +132,4 @@ let b:current_syntax = "clipper"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/clojure.vim b/uvim/runtime/syntax/clojure.mnv
index 0d63728250..487cdb3058 100644
--- a/uvim/runtime/syntax/clojure.vim
+++ b/uvim/runtime/syntax/clojure.mnv
@@ -1,12 +1,12 @@
-" Vim indent file
+" MNV indent file
 " Language:           Clojure
 " Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
 "                     Meikel Brandmeyer <mb@kotka.de>
 "                     Toralf Wittner <toralf.wittner@gmail.com>
 " Contributors:       Joel Holdbrooks <cjholdbrooks@gmail.com> (Regexp support, bug fixes)
-" URL:                https://github.com/clojure-vim/clojure.vim
-" License:            Vim (see :h license)
+" URL:                https://github.com/clojure-mnv/clojure.mnv
+" License:            MNV (see :h license)
 " Last Change:        2022-03-24
 
 if exists("b:current_syntax")
@@ -14,14 +14,14 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_sav = &cpo
-set cpo&vim
+set cpo&mnv
 
 if has("folding") && exists("g:clojure_fold") && g:clojure_fold > 0
 	setlocal foldmethod=syntax
 endif
 
 " -*- KEYWORDS -*-
-" Generated from https://github.com/clojure-vim/clojure.vim/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/clojure-mnv/clojure.mnv/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/mnv_clojure_static/generate.clj
 " Clojure version 1.11.0
 let s:clojure_syntax_keywords = {
 	\ 'clojureBoolean': ["false","true"],
@@ -95,7 +95,7 @@ syntax region clojureRegexpQuoted start=/\\Q/ms=e+1 skip=/\\\\\|\\"/ end=/\\E/me
 syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/       end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
 
 " -*- CHARACTER PROPERTY CLASSES -*-
-" Generated from https://github.com/clojure-vim/clojure.vim/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/clojure-mnv/clojure.mnv/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/mnv_clojure_static/generate.clj
 " Java version 17.0.2
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
@@ -147,7 +147,7 @@ if exists('g:clojure_discard_macro') && g:clojure_discard_macro
 endif
 
 " -*- TOP CLUSTER -*-
-" Generated from https://github.com/clojure-vim/clojure.vim/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/clojure-mnv/clojure.mnv/blob/fd280e33e84c88e97860930557dba3ff80b1a82d/clj/src/mnv_clojure_static/generate.clj
 syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDiscard,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVariable,clojureVector
 
 syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
@@ -215,4 +215,4 @@ let b:current_syntax = "clojure"
 let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
-" vim:sts=8:sw=8:ts=8:noet
+" mnv:sts=8:sw=8:ts=8:noet
diff --git a/uvim/runtime/syntax/cmacro.vim b/uvim/runtime/syntax/cmacro.mnv
index 1d448f0d1b..b1da2aa82b 100644
--- a/uvim/runtime/syntax/cmacro.vim
+++ b/uvim/runtime/syntax/cmacro.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	C macro for C preprocessor
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
 " Last Change:	2024 Dec 31
-" modified from syntax/c.vim
+" modified from syntax/c.mnv
 
 " C compiler has a preprocessor: `cpp -P test.txt`
 " test.txt doesn't need to be a C file
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Accept %: for # (C99)
 syn region	cmacroPreCondit	start="^\s*\zs\%(%:\|#\)\s*\%(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cmacroCppParen,cmacroNumbers
diff --git a/uvim/runtime/syntax/cmake.vim b/uvim/runtime/syntax/cmake.mnv
index c95503beb5..3f31da5d68 100644
--- a/uvim/runtime/syntax/cmake.vim
+++ b/uvim/runtime/syntax/cmake.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
 " Version:      cmake version 3.27.20230713-gdc88dd5
 " Language:     CMake
@@ -11,13 +11,13 @@
 "
 " License:      The CMake license applies to this file. See
 "               https://cmake.org/licensing
-"               This implies that distribution with Vim is allowed
+"               This implies that distribution with MNV is allowed
 
 if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region cmakeBracketArgument start="\[\z(=*\)\[" end="\]\z1\]" contains=cmakeTodo,@Spell
 
@@ -4977,4 +4977,4 @@ let b:current_syntax = "cmake"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: set nowrap:
+" mnv: set nowrap:
diff --git a/uvim/runtime/syntax/cmakecache.vim b/uvim/runtime/syntax/cmakecache.mnv
index f07c719811..cf019183fd 100644
--- a/uvim/runtime/syntax/cmakecache.vim
+++ b/uvim/runtime/syntax/cmakecache.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     cmakecache - CMakeCache.txt files generated by CMake
 " Author:       bfrg <https://github.com/bfrg>
-" Upstream:      https://github.com/bfrg/vim-cmakecache-syntax
+" Upstream:      https://github.com/bfrg/mnv-cmakecache-syntax
 " Last Change:  Nov 28, 2019
-" License:      Same as Vim itself (see :h license)
+" License:      Same as MNV itself (see :h license)
 
 if exists('b:current_syntax')
     finish
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Comments start with # or //
 syntax region CMakeCacheComment start="#\|//" end="$"
@@ -18,7 +18,7 @@ syntax region CMakeCacheComment start="#\|//" end="$"
 " Match 'key' in key:type=value
 syntax match CMakeCacheKey "^\s*\w\+\(-ADVANCED\)\=:"me=e-1
 
-" Highlight 'str' in key:STRING=str (many thanks to Nickspoons in #vim!)
+" Highlight 'str' in key:STRING=str (many thanks to Nickspoons in #mnv!)
 syntax region CMakeCacheStringVar   matchgroup=CMakeCacheType start=":STRING="ms=s+1,rs=e-1 end="$" contains=CMakeCacheString keepend
 syntax region CMakeCacheString      start="="ms=s+1 end="$" contained
 
diff --git a/uvim/runtime/syntax/cmod.vim b/uvim/runtime/syntax/cmod.mnv
index ea37682ff6..2566a7c066 100644
--- a/uvim/runtime/syntax/cmod.vim
+++ b/uvim/runtime/syntax/cmod.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Cmod
 " Current Maintainer:	Stephen R. van den Berg <srb@cuci.nl>
 " Last Change:		2018 Jan 23
@@ -12,15 +12,15 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 
 if !exists("c_autodoc")
   " For embedded Autodoc documentation
-  syn include @cmodAutodoc <sfile>:p:h/autodoc.vim
+  syn include @cmodAutodoc <sfile>:p:h/autodoc.mnv
   unlet b:current_syntax
 endif
 
@@ -141,4 +141,4 @@ let b:current_syntax = "cmod"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cmusrc.vim b/uvim/runtime/syntax/cmusrc.mnv
index b821affd57..c167f8d0bc 100644
--- a/uvim/runtime/syntax/cmusrc.vim
+++ b/uvim/runtime/syntax/cmusrc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
 
@@ -7,7 +7,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/cobol.vim b/uvim/runtime/syntax/cobol.mnv
index 5d649441a3..661c82f649 100644
--- a/uvim/runtime/syntax/cobol.vim
+++ b/uvim/runtime/syntax/cobol.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     COBOL
 " Maintainer: Ankit Jain <ajatkj@yahoo.co.in>
-"     (formerly Tim Pope <vimNOSPAM@tpope.info>)
+"     (formerly Tim Pope <mnvNOSPAM@tpope.info>)
 "     (formerly Davyd Ondrejko <vondraco@columbus.rr.com>)
 "     (formerly Sitaram Chamarty <sitaram@diac.com> and
 "               James Mitchell <james_mitchell@acm.org>)
@@ -257,4 +257,4 @@ hi def link cobolStart          Comment
 
 let b:current_syntax = "cobol"
 
-" vim: ts=6 nowrap
+" mnv: ts=6 nowrap
diff --git a/uvim/runtime/syntax/coco.vim b/uvim/runtime/syntax/coco.mnv
index dc21314e35..452d31a6d3 100644
--- a/uvim/runtime/syntax/coco.vim
+++ b/uvim/runtime/syntax/coco.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Coco/R
 " Maintainer:   Ashish Shukla <wahjava@gmail.com>
 " Last Change:  2022 Jun 14
 " Remark:       Coco/R syntax partially implemented.
-" License:      Vim license
+" License:      MNV license
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/codeowners.vim b/uvim/runtime/syntax/codeowners.mnv
index 7370220b7a..e995d28693 100644
--- a/uvim/runtime/syntax/codeowners.vim
+++ b/uvim/runtime/syntax/codeowners.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	codeowners
 " Maintainer:	Jon Parise <jon@indelible.org>
 " Last Change:	2025 Sep 14
diff --git a/uvim/runtime/syntax/colortest.vim b/uvim/runtime/syntax/colortest.mnv
index 1dd860c1d3..f661439024 100644
--- a/uvim/runtime/syntax/colortest.vim
+++ b/uvim/runtime/syntax/colortest.mnv
@@ -1,8 +1,8 @@
-" Vim script for testing colors
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV script for testing colors
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Contributors:	Rafael Garcia-Suarez, Charles Campbell
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " edit this file, then do ":source %", and check if the colors match
 
diff --git a/uvim/runtime/syntax/conaryrecipe.vim b/uvim/runtime/syntax/conaryrecipe.mnv
index f94fdd4074..a76c3f55aa 100644
--- a/uvim/runtime/syntax/conaryrecipe.vim
+++ b/uvim/runtime/syntax/conaryrecipe.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Conary Recipe
 " Maintainer:	rPath Inc <http://www.rpath.com>
 " Updated:	2007-12-08
@@ -7,7 +7,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/python.vim
+runtime! syntax/python.mnv
 
 syn keyword conarySFunction	mainDir addAction addSource addArchive addPatch
 syn keyword conarySFunction	addRedirect addSvnSnapshot addMercurialSnapshot
diff --git a/uvim/runtime/syntax/conf.vim b/uvim/runtime/syntax/conf.mnv
index 15a1fffab3..b8a81423ee 100644
--- a/uvim/runtime/syntax/conf.vim
+++ b/uvim/runtime/syntax/conf.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	generic configure file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -24,4 +24,4 @@ hi def link confString	String
 
 let b:current_syntax = "conf"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/config.vim b/uvim/runtime/syntax/config.mnv
index 2e8f62693c..1d9f990bfa 100644
--- a/uvim/runtime/syntax/config.vim
+++ b/uvim/runtime/syntax/config.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Autoconf M4
 " Former Maintainer:	Christian Hammesr <ch@lathspell.westend.com>
 " Last Change:	2018 Feb 03
@@ -6,7 +6,7 @@
 " 				(patch from Khym Chanur to add @Spell)
 " 				(patch from James McCoy to fix paren matching)
 " 				(2025 Sep 14 patch from Damien Lejay to detect unportable +=)
-" 				(2025 Sep 18 by Vim Project: fix inconsistent group name)
+" 				(2025 Sep 18 by MNV Project: fix inconsistent group name)
 
 " Well, I actually even do not know much about m4. This explains why there
 " is probably very much missing here, yet !
@@ -57,4 +57,4 @@ hi def link configPlusEq    Error
 
 let b:current_syntax = "config"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/confini.vim b/uvim/runtime/syntax/confini.mnv
index 009a60c60a..c9e75c96bf 100644
--- a/uvim/runtime/syntax/confini.vim
+++ b/uvim/runtime/syntax/confini.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: confini
 " Last Change:
-" 2025 May 02 by Vim project commented line starts with # only
+" 2025 May 02 by MNV project commented line starts with # only
 
 " Quit if a syntax file was already loaded
 if exists("b:current_syntax")
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " Use the cfg syntax for now, it's similar.
-runtime! syntax/cfg.vim
+runtime! syntax/cfg.mnv
 
 " Only accept '#' as the start of a comment.
 syn clear CfgComment
diff --git a/uvim/runtime/syntax/context.vim b/uvim/runtime/syntax/context.mnv
index 07b59c0fcb..d7802b27b9 100644
--- a/uvim/runtime/syntax/context.vim
+++ b/uvim/runtime/syntax/context.mnv
@@ -1,6 +1,6 @@
-vim9script
+mnv9script
 
-# Vim syntax file
+# MNV syntax file
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
@@ -23,9 +23,9 @@ syn iskeyword @,48-57,_,!,?,a-z,A-Z,192-255
 
 syn spell toplevel
 
-runtime! syntax/shared/context-data-context.vim
-runtime! syntax/shared/context-data-interfaces.vim
-runtime! syntax/shared/context-data-tex.vim
+runtime! syntax/shared/context-data-context.mnv
+runtime! syntax/shared/context-data-interfaces.mnv
+runtime! syntax/shared/context-data-tex.mnv
 
 syn match contextCommand '\\\k\+\>' display contains=@NoSpell
 
@@ -66,7 +66,7 @@ syn region contextDisplayMath matchgroup=contextBlockDelim start='\\startformula
 
 # MetaFun
 b:mp_metafun = 1
-syn include @mpTop syntax/mp.vim
+syn include @mpTop syntax/mp.mnv
 unlet b:current_syntax
 
 syn region  contextMPGraphic  matchgroup=contextBlockDelim
@@ -79,7 +79,7 @@ syn region  contextMPGraphic  matchgroup=contextBlockDelim
       \ contains=@mpTop,@NoSpell
 
 # Lua
-syn include @luaTop syntax/lua.vim
+syn include @luaTop syntax/lua.mnv
 unlet b:current_syntax
 
 syn region  contextLuaCode    matchgroup=contextBlockDelim
@@ -94,7 +94,7 @@ syn region  contextBeginEndLua matchgroup=contextSpecial
       \ contained contains=@luaTop,@NoSpell
 
 for synname in keys(context_include)
-  execute 'syn include @' .. synname .. 'Top' 'syntax/' .. synname .. '.vim'
+  execute 'syn include @' .. synname .. 'Top' 'syntax/' .. synname .. '.mnv'
   unlet b:current_syntax
   execute 'syn region context' .. context_include[synname] .. 'Code'
         \ 'matchgroup=contextBlockDelim'
@@ -141,4 +141,4 @@ hi def link contextType       Type
 
 b:current_syntax = 'context'
 
-# vim: sw=2 fdm=marker
+# mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/syntax/cpp.vim b/uvim/runtime/syntax/cpp.mnv
index 5ea52ec502..75536c2e09 100644
--- a/uvim/runtime/syntax/cpp.vim
+++ b/uvim/runtime/syntax/cpp.mnv
@@ -1,23 +1,23 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	C++
 " Maintainer:		This runtime file is looking for a new maintainer.
-" Previous Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
+" Previous Maintainer:	mnv-jp (https://github.com/mnv-jp/mnv-cpp)
 "			Ken Shan <ccshan@post.harvard.edu>
 " Last Change:	2024 May 04
-"   2024 May 04 by Vim Project fix digit separator in octals and floats
-"   2026 Jan 06 by Vim Project orphaning announcement
-"   2026 Jan 08 by Vim Project highlight capital letter prefixes for numbers
+"   2024 May 04 by MNV Project fix digit separator in octals and floats
+"   2026 Jan 06 by MNV Project orphaning announcement
+"   2026 Jan 08 by MNV Project highlight capital letter prefixes for numbers
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-" inform C syntax that the file was included from cpp.vim
+" inform C syntax that the file was included from cpp.mnv
 let b:filetype_in_cpp_family = 1
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 unlet b:filetype_in_cpp_family
 
@@ -75,7 +75,7 @@ if !exists("cpp_no_cpp17")
   syn match cppFloat		display contained "\<0[Xx]\x*\.\x\+p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
   syn match cppFloat		display contained "\<0[Xx]\x\+\.\=p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
 
-  " TODO: push this up to c.vim if/when supported in C23
+  " TODO: push this up to c.mnv if/when supported in C23
   syn match cppCharacter	"u8'[^\\]'"
   syn match cppCharacter	"u8'[^']*'" contains=cSpecial
   if exists("c_gnu")
@@ -131,4 +131,4 @@ hi def link cppModule		Include
 
 let b:current_syntax = "cpp"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/crm.vim b/uvim/runtime/syntax/crm.mnv
index 5285de3e23..b752019483 100644
--- a/uvim/runtime/syntax/crm.vim
+++ b/uvim/runtime/syntax/crm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             CRM114
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword crmTodo       contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/crontab.vim b/uvim/runtime/syntax/crontab.mnv
index 12daa9b7b8..ed4c1e6a1a 100644
--- a/uvim/runtime/syntax/crontab.vim
+++ b/uvim/runtime/syntax/crontab.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language: crontab
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " Original Maintainer: John Hoelzel johnh51@users.sourceforge.net
 " License: This file can be redistribued and/or modified under the same terms
-"   as Vim itself.
+"   as MNV itself.
 " Filenames: /tmp/crontab.* used by "crontab -e"
 " Last Change: 2022-09-22
 "
@@ -64,4 +64,4 @@ hi def link crontabCmnt		Comment
 
 let b:current_syntax = "crontab"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cs.vim b/uvim/runtime/syntax/cs.mnv
index 3ae6bfca8d..9ba7917a0d 100644
--- a/uvim/runtime/syntax/cs.vim
+++ b/uvim/runtime/syntax/cs.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:            C#
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
 " Last Change:         2025-03-14
 " Filenames:           *.cs
-" License:             Vim (see :h license)
-" Repository:          https://github.com/nickspoons/vim-cs
+" License:             MNV (see :h license)
+" Repository:          https://github.com/nickspoons/mnv-cs
 "
 " References:
 "   -   ECMA-334 5th Edition: C# Language Specification
@@ -19,7 +19,7 @@ if exists('b:current_syntax')
 endif
 
 let s:save_cpo = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
 syn keyword	csType	nint nuint " contextual
@@ -144,10 +144,10 @@ syn match	csXmlLineCommentLeader	"///" contained
 syn match	csXmlLineComment	"///.*$" contains=csXmlLineCommentLeader,@csXml,@Spell keepend
 syn match	csXmlBlockCommentMiddle	"^\s*\zs\*" contained
 syn region	csXmlBlockComment	start="/\*\*" end="\*/" contains=@csXml,@Spell,csXmlBlockCommentMiddle keepend
-syn include	@csXml syntax/xml.vim
+syn include	@csXml syntax/xml.mnv
 hi def link	xmlRegion Comment
 
-" Since syntax/xml.vim contains `syn spell toplevel`, we need to set it back to `default` here.
+" Since syntax/xml.mnv contains `syn spell toplevel`, we need to set it back to `default` here.
 syn spell default
 
 " Pre-processing directives
@@ -357,4 +357,4 @@ let b:current_syntax = 'cs'
 let &cpoptions = s:save_cpo
 unlet s:save_cpo
 
-" vim: vts=16,28
+" mnv: vts=16,28
diff --git a/uvim/runtime/syntax/csc.vim b/uvim/runtime/syntax/csc.mnv
index b1bc4d6a7b..2ae65bd7f2 100644
--- a/uvim/runtime/syntax/csc.vim
+++ b/uvim/runtime/syntax/csc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Essbase script
 " Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
 " Last change:	2011 Dec 25 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " folds: fix/endfix and comments
 sy	region	EssFold start="\<Fix" end="EndFix" transparent fold
@@ -188,4 +188,4 @@ let b:current_syntax = "csc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/csdl.vim b/uvim/runtime/syntax/csdl.mnv
index f7d30f1646..e0b53ff3f4 100644
--- a/uvim/runtime/syntax/csdl.vim
+++ b/uvim/runtime/syntax/csdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Curated Stream Definition Language (CSDL)
 " Maintainer: Jacek Artymiak
 " Latest Revision: 25 February 2013
diff --git a/uvim/runtime/syntax/csh.vim b/uvim/runtime/syntax/csh.mnv
index cf1c68d65f..d033adf871 100644
--- a/uvim/runtime/syntax/csh.vim
+++ b/uvim/runtime/syntax/csh.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		C-shell (csh)
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Former Maintainer:	Charles E. Campbell
@@ -139,4 +139,4 @@ endif
 
 let b:current_syntax = "csh"
 
-" vim: ts=18
+" mnv: ts=18
diff --git a/uvim/runtime/syntax/csp.vim b/uvim/runtime/syntax/csp.mnv
index 8001b1fe7e..c74b4707e3 100644
--- a/uvim/runtime/syntax/csp.vim
+++ b/uvim/runtime/syntax/csp.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CSP (Communication Sequential Processes, using FDR input syntax)
 " Maintainer:	Jan Bredereke <brederek@tzi.de>
 " Version:	0.6.0
 " Last change:	Mon Mar 25, 2002
-" URL:		http://www.tzi.de/~brederek/vim/
+" URL:		http://www.tzi.de/~brederek/mnv/
 " Copying:	You may distribute and use this file freely, in the same
-"		way as the vim editor itself.
+"		way as the mnv editor itself.
 "
 " To Do:	- Probably I missed some keywords or operators, please
 "		  fix them and notify me, the maintainer.
@@ -149,8 +149,8 @@ syn sync lines=250
 " Only when an item doesn't have highlighting yet
 
 " The default methods for highlighting.  Can be overridden later
-" (For vim version <=5.7, the command groups are defined in
-" $VIMRUNTIME/syntax/synload.vim )
+" (For mnv version <=5.7, the command groups are defined in
+" $MNVRUNTIME/syntax/synload.mnv )
 hi def link cspComment			Comment
 hi def link cspNumber			Number
 hi def link cspConditional			Conditional
@@ -174,9 +174,9 @@ hi def link cspRttPragmaSdlTailArg		Define
 hi def link cspRttPragmaSdlTransName	Default
 hi def link cspRttPragmaSdlTransTailArg	Define
 hi def link cspReservedIdentifier	Error
-" (Currently unused vim method: Debug)
+" (Currently unused mnv method: Debug)
 
 
 let b:current_syntax = "csp"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/css.vim b/uvim/runtime/syntax/css.mnv
index 3f28717959..1e5bc3a8f5 100644
--- a/uvim/runtime/syntax/css.vim
+++ b/uvim/runtime/syntax/css.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Cascading Style Sheets
 " Previous Contributor List:
 "               Jules Wang      <w.jq0722@gmail.com>
 "               Claudio Fleiner <claudio@fleiner.com>
 "               Yeti            (Add full CSS2, HTML4 support)
 "               Nikolai Weibull (Add CSS2 support)
-" URL:          https://github.com/vim-language-dept/css-syntax.vim
+" URL:          https://github.com/mnv-language-dept/css-syntax.mnv
 " Maintainer:   Jay Sitter <jay@jaysitter.com>
 " Last Change:  2024 Mar 2
 " Changelog:
@@ -23,7 +23,7 @@ elseif exists("b:current_syntax") && b:current_syntax == "css"
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 " Add dash to allowed keyword characters.
@@ -672,4 +672,4 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/csv.vim b/uvim/runtime/syntax/csv.mnv
index 848029a480..cf12724aea 100644
--- a/uvim/runtime/syntax/csv.vim
+++ b/uvim/runtime/syntax/csv.mnv
@@ -1,4 +1,4 @@
-vim9script
+mnv9script
 
 # Maintainer: Maxim Kim <habamax@gmail.com>
 # Last Update: 2024-06-18
diff --git a/uvim/runtime/syntax/cterm.vim b/uvim/runtime/syntax/cterm.mnv
index 1b6cb2893f..086bd92307 100644
--- a/uvim/runtime/syntax/cterm.vim
+++ b/uvim/runtime/syntax/cterm.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Century Term Command Script
 " Maintainer:	Sean M. McKee <mckee@misslink.net>
 " Last Change:	2002 Apr 13
-" Version Info: @(#)cterm.vim	1.7	97/12/15 09:23:14
+" Version Info: @(#)cterm.mnv	1.7	97/12/15 09:23:14
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -174,4 +174,4 @@ hi def link ctermNumber		Number
 
 let b:current_syntax = "cterm"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/ctrlh.vim b/uvim/runtime/syntax/ctrlh.mnv
index b34f335785..ff7b6750ed 100644
--- a/uvim/runtime/syntax/ctrlh.vim
+++ b/uvim/runtime/syntax/ctrlh.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CTRL-H (e.g., ASCII manpages)
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Existing syntax is kept, this file can be used as an addition
 
@@ -21,4 +21,4 @@ hi def link CtrlHHide Ignore
 hi def CtrlHUnderline term=underline cterm=underline gui=underline
 hi def CtrlHBold term=bold cterm=bold gui=bold
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cucumber.vim b/uvim/runtime/syntax/cucumber.mnv
index 90fdbfaf4f..241e9c3f5e 100644
--- a/uvim/runtime/syntax/cucumber.vim
+++ b/uvim/runtime/syntax/cucumber.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Cucumber
-" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:   Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:    *.feature
 " Last Change:	2023 Dec 28
 
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
     finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 syn sync minlines=20
@@ -167,4 +167,4 @@ let b:current_syntax = "cucumber"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:set sts=2 sw=2:
+" mnv:set sts=2 sw=2:
diff --git a/uvim/runtime/syntax/cuda.vim b/uvim/runtime/syntax/cuda.mnv
index 8306d096a0..69d6fc98c4 100644
--- a/uvim/runtime/syntax/cuda.vim
+++ b/uvim/runtime/syntax/cuda.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CUDA (NVIDIA Compute Unified Device Architecture)
 " Maintainer:	Timothy B. Terriberry <tterribe@users.sourceforge.net>
 " Last Change:	2024 Apr 04
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 
 " CUDA extentions.
 " Reference: https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#c-language-extensions
@@ -50,4 +50,4 @@ hi def link cudaConstant	Constant
 
 let b:current_syntax = "cuda"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cupl.vim b/uvim/runtime/syntax/cupl.mnv
index 54495f8ba5..d1d4a82317 100644
--- a/uvim/runtime/syntax/cupl.vim
+++ b/uvim/runtime/syntax/cupl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CUPL
 " Maintainer:	John Cook <johncook3@gmail.com>
 " Last Change:	2011 Dec 27
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " this language is oblivious to case.
 syn case ignore
@@ -121,4 +121,4 @@ let b:current_syntax = "cupl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/cuplsim.vim b/uvim/runtime/syntax/cuplsim.mnv
index 36eb4c3555..b034733352 100644
--- a/uvim/runtime/syntax/cuplsim.vim
+++ b/uvim/runtime/syntax/cuplsim.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CUPL simulation
 " Maintainer:	John Cook <john.cook@kla-tencor.com>
 " Last Change:	2001 Apr 25
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the CUPL syntax to start with
-runtime! syntax/cupl.vim
+runtime! syntax/cupl.mnv
 unlet b:current_syntax
 
 " omit definition-specific stuff
@@ -48,7 +48,7 @@ syn sync minlines=1
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-" append to the highlighting links in cupl.vim
+" append to the highlighting links in cupl.mnv
 " The default highlighting.
 hi def link cuplsimOrder		cuplStatement
 hi def link cuplsimBase		cuplStatement
@@ -60,4 +60,4 @@ hi def link cuplsimOrderFormat	cuplNumber
 
 
 let b:current_syntax = "cuplsim"
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/cvs.vim b/uvim/runtime/syntax/cvs.mnv
index e1e413fcf9..5deae41960 100644
--- a/uvim/runtime/syntax/cvs.vim
+++ b/uvim/runtime/syntax/cvs.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CVS commit file
 " Maintainer:	Matt Dunford (zenmatic@gmail.com)
 " Last Change:	Sat Nov 24 23:25:11 CET 2001
diff --git a/uvim/runtime/syntax/cvsrc.vim b/uvim/runtime/syntax/cvsrc.mnv
index 9522de6436..8e91987436 100644
--- a/uvim/runtime/syntax/cvsrc.vim
+++ b/uvim/runtime/syntax/cvsrc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             cvs(1) RC file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region  cvsrcString   display oneline start=+"+ skip=+\\\\\|\\\\"+ end=+"+
 syn region  cvsrcString   display oneline start=+'+ skip=+\\\\\|\\\\'+ end=+'+
diff --git a/uvim/runtime/syntax/cweb.vim b/uvim/runtime/syntax/cweb.mnv
index 4e06b3646d..41c38ac8e4 100644
--- a/uvim/runtime/syntax/cweb.vim
+++ b/uvim/runtime/syntax/cweb.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	CWEB
 " Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
 " Last Change:	2011 Dec 25 by Thilo Six
@@ -22,15 +22,15 @@ endif
 " level in the CWEB syntax, e.g., in the preamble.  In general, a CWEB source
 " code can be seen as a normal TeX document with some C/C++ material
 " interspersed in certain defined regions.
-runtime! syntax/tex.vim
+runtime! syntax/tex.mnv
 unlet b:current_syntax
 
 " Read the C/C++ syntax too; C/C++ syntax items are treated as such in the
 " C/C++ section of a CWEB chunk or in inner C/C++ context in "|...|" groups.
-syntax include @webIncludedC <sfile>:p:h/cpp.vim
+syntax include @webIncludedC <sfile>:p:h/cpp.mnv
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Inner C/C++ context (ICC) should be quite simple as it's comprised of
 " material in "|...|"; however the naive definition for this region would
@@ -65,4 +65,4 @@ let b:current_syntax = "cweb"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/cynlib.vim b/uvim/runtime/syntax/cynlib.mnv
index 24ad2a2e31..aa1d268e90 100644
--- a/uvim/runtime/syntax/cynlib.vim
+++ b/uvim/runtime/syntax/cynlib.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Cynlib(C++)
 " Maintainer:   Phil Derrick <phild@forteds.com>
 " Last change:  2001 Sep 02
-" URL http://www.derrickp.freeserve.co.uk/vim/syntax/cynlib.vim
+" URL http://www.derrickp.freeserve.co.uk/mnv/syntax/cynlib.mnv
 "
 " Language Information
 "
@@ -23,7 +23,7 @@ endif
 
 
 " Read the C++ syntax to start with - this includes the C syntax
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 unlet b:current_syntax
 
 " Cynlib extensions
diff --git a/uvim/runtime/syntax/cynpp.vim b/uvim/runtime/syntax/cynpp.mnv
index 3064b11a63..b20f0a7f5f 100644
--- a/uvim/runtime/syntax/cynpp.vim
+++ b/uvim/runtime/syntax/cynpp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Cyn++
 " Maintainer:   Phil Derrick <phild@forteds.com>
 " Last change:  2001 Sep 02
@@ -25,7 +25,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the Cynlib syntax to start with - this includes the C++ syntax
-runtime! syntax/cynlib.vim
+runtime! syntax/cynlib.mnv
 unlet b:current_syntax
 
 
diff --git a/uvim/runtime/syntax/d.vim b/uvim/runtime/syntax/d.mnv
index fdac98c437..dc69ff095a 100644
--- a/uvim/runtime/syntax/d.vim
+++ b/uvim/runtime/syntax/d.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file for the D programming language (version 1.076 and 2.069).
+" MNV syntax file for the D programming language (version 1.076 and 2.069).
 "
 " Language:     D
 " Maintainer:   Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
@@ -18,7 +18,7 @@
 "   - Petar Kirov
 "
 " Please submit bugs/comments/suggestions to the github repo: 
-" https://github.com/JesseKPhillips/d.vim
+" https://github.com/JesseKPhillips/d.mnv
 "
 " Options:
 "   d_comment_strings - Set to highlight strings and numbers in comments.
@@ -35,7 +35,7 @@ endif
 
 " Support cpoptions
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Set the current syntax to be known as d
 let b:current_syntax = "d"
diff --git a/uvim/runtime/syntax/dart.vim b/uvim/runtime/syntax/dart.mnv
index d1c2bf2158..e5234d74bc 100644
--- a/uvim/runtime/syntax/dart.vim
+++ b/uvim/runtime/syntax/dart.mnv
@@ -1,19 +1,19 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:     Dart
 " Maintainer:   Eugene 'pr3d4t0r' Ciurana <dart.syntax AT cime.net >
-" Source:       https://github.com/pr3d4t0r/dart-vim-syntax
+" Source:       https://github.com/pr3d4t0r/dart-mnv-syntax
 " Last Update:	2019 Oct 19
 "
-" License:      Vim is Charityware.  dart.vim syntax is Charityware.
+" License:      MNV is Charityware.  dart.mnv syntax is Charityware.
 "               (c) Copyright 2019 by Eugene Ciurana / pr3d4t0r.  Licensed
-"               under the standard VIM LICENSE - Vim command :help uganda.txt
+"               under the standard MNV LICENSE - MNV command :help uganda.txt
 "               for details.
 "
 " Questions, comments:  <dart.syntax AT cime.net>
 "                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
 "
-" vim: set fileencoding=utf-8:
+" mnv: set fileencoding=utf-8:
 
 
 " Quit when a (custom) syntax file was already loaded
@@ -22,7 +22,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 
 syn keyword dartCommentTodo     contained TODO FIXME XXX TBD
diff --git a/uvim/runtime/syntax/datascript.vim b/uvim/runtime/syntax/datascript.mnv
index 7b686a144e..d1ca509f0c 100644
--- a/uvim/runtime/syntax/datascript.vim
+++ b/uvim/runtime/syntax/datascript.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DataScript
 " Maintainer:	Dominique Pelle <dominique.pelle@gmail.com>
 " Last Change:	2015 Jul 30
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword dsPackage      import package
 syn keyword dsType         bit bool string
diff --git a/uvim/runtime/syntax/dax.vim b/uvim/runtime/syntax/dax.mnv
index 12e54ee1f5..fc66ef8b6e 100644
--- a/uvim/runtime/syntax/dax.vim
+++ b/uvim/runtime/syntax/dax.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Data Analysis Expressions (DAX)
 " Maintainer:   Anarion Dunedain <anarion80@gmail.com>
 " Last Change:
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
         finish
 endif
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " There are DAX functions with dot in the name (like VARX.S)
 setlocal iskeyword+=.
@@ -89,7 +89,7 @@ syn keyword daxFunction
   \ VARX.P VARX.S VDB WEEKDAY WEEKNUM WINDOW XIRR
   \ XNPV YEAR YEARFRAC YIELD YIELDDISC YIELDMAT
 
-" CONTAINS is a vim syntax keyword and can't be a defined keyword
+" CONTAINS is a mnv syntax keyword and can't be a defined keyword
 syn match daxFunction "CONTAINS"
 
 " Numbers
@@ -148,4 +148,4 @@ let b:current_syntax = "dax"
 let &cpo = s:keepcpo
 unlet! s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/dcd.vim b/uvim/runtime/syntax/dcd.mnv
index 058d272375..a1ffe735fa 100644
--- a/uvim/runtime/syntax/dcd.vim
+++ b/uvim/runtime/syntax/dcd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	WildPackets EtherPeek Decoder (.dcd) file
 " Maintainer:	Christopher Shinn <christopher@lucent.com>
 " Last Change:	2003 Apr 25
diff --git a/uvim/runtime/syntax/dcl.vim b/uvim/runtime/syntax/dcl.mnv
index 1987ebbce6..3e40552844 100644
--- a/uvim/runtime/syntax/dcl.vim
+++ b/uvim/runtime/syntax/dcl.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DCL (Digital Command Language - vms)
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Mar 26, 2019
 " Version:	13
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_DCL
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -105,7 +105,7 @@ syn match   dclGotoLabel	"^\$\s*\I\i*:\s*$"	contains=dclStart
 " parameters
 syn match   dclParam	"'\I[a-zA-Z0-9_$]*'\="
 
-" () matching (the clusters are commented out until a vim/vms comes out for v5.2+)
+" () matching (the clusters are commented out until a mnv/vms comes out for v5.2+)
 "syn cluster dclNextGroups	contains=dclCmdDirPath,dclCmdProc,dclCmdProc,dclDirPath,dclFilename,dclFilename,dclMdfySet,dclMdfySetString,delCmdProc,dclExe,dclTodo
 "syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,@dclNextGroups
 syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,dclCmdDirPath,dclCmdProc,dclCmdProc,dclDirPath,dclFilename,dclFilename,dclMdfySet,dclMdfySetString,delCmdProc,dclExe,dclTodo
@@ -150,4 +150,4 @@ endif
 
 let b:current_syntax = "dcl"
 
-" vim: ts=16
+" mnv: ts=16
diff --git a/uvim/runtime/syntax/deb822sources.vim b/uvim/runtime/syntax/deb822sources.mnv
index ec45605905..21e465646f 100644
--- a/uvim/runtime/syntax/deb822sources.vim
+++ b/uvim/runtime/syntax/deb822sources.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Debian deb822-format source list file
-" Maintainer:   Debian Vim Maintainers
+" Maintainer:   Debian MNV Maintainers
 " Last Change: 2024 Jan 30
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/deb822sources.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/deb822sources.mnv
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -21,7 +21,7 @@ syn match deb822sourcesNonFreeComponent   /\<\(contrib\|non-free-firmware\|non-f
 syn region deb822sourcesComment start="^#" end="$"
 
 " Include Debian versioning information
-runtime! syntax/shared/debversions.vim
+runtime! syntax/shared/debversions.mnv
 
 exe 'syn match deb822sourcesSupportedSuites contained + *\([[:alnum:]_./]*\)\<\('. join(g:debSharedSupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\) *+'
 exe 'syn match deb822sourcesUnsupportedSuites contained + *\([[:alnum:]_./]*\)\<\('. join(g:debSharedUnsupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\) *+'
diff --git a/uvim/runtime/syntax/debchangelog.vim b/uvim/runtime/syntax/debchangelog.mnv
index da35a6a10b..8f0d6af230 100644
--- a/uvim/runtime/syntax/debchangelog.vim
+++ b/uvim/runtime/syntax/debchangelog.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Debian changelog files
-" Maintainer:  Debian Vim Maintainers
+" Maintainer:  Debian MNV Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
 " Last Change: 2023 Oct 11
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debchangelog.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/debchangelog.mnv
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -18,7 +18,7 @@ let s:urgency='urgency=\(low\|medium\|high\|emergency\|critical\)\( [^[:space:],
 let s:binNMU='binary-only=yes'
 
 " Include Debian versioning information
-runtime! syntax/shared/debversions.vim
+runtime! syntax/shared/debversions.mnv
 
 exe 'syn match debchangelogTarget	contained "\%( \%('.join(g:debSharedSupportedVersions, '\|').'\)\>[-[:alnum:]]*\)\+"'
 exe 'syn match debchangelogUnsupportedTarget	contained "\%( \%('.join(g:debSharedUnsupportedVersions, '\|').'\)\>[-[:alnum:]]*\)\+"'
@@ -59,4 +59,4 @@ hi def link debchangelogUnsupportedTarget Identifier
 
 let b:current_syntax = 'debchangelog'
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/debcontrol.vim b/uvim/runtime/syntax/debcontrol.mnv
index 7b4d14062a..14a1706832 100644
--- a/uvim/runtime/syntax/debcontrol.vim
+++ b/uvim/runtime/syntax/debcontrol.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Debian control files
-" Maintainer:  Debian Vim Maintainers
+" Maintainer:  Debian MNV Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
 " Last Change: 2026 Jan 20
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcontrol.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/debcontrol.mnv
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -12,7 +12,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Should match case except for the keys of each field
 syn case match
@@ -26,7 +26,7 @@ syn match debcontrolElse "^.*$"
 syn match debControlComma ",[ \t]*"
 syn match debControlSpace "[ \t]"
 
-runtime! syntax/shared/debarchitectures.vim
+runtime! syntax/shared/debarchitectures.mnv
 
 " Define some common expressions we can use later on
 syn keyword debcontrolArchitecture contained all any
@@ -149,4 +149,4 @@ let b:current_syntax = 'debcontrol'
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/debcopyright.vim b/uvim/runtime/syntax/debcopyright.mnv
index cb9e8965de..dcac4854a9 100644
--- a/uvim/runtime/syntax/debcopyright.vim
+++ b/uvim/runtime/syntax/debcopyright.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Debian copyright file
-" Maintainer:  Debian Vim Maintainers
+" Maintainer:  Debian MNV Maintainers
 " Last Change: 2024 Jul 28
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcopyright.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/debcopyright.mnv
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -10,7 +10,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -30,4 +30,4 @@ let b:current_syntax = 'debcopyright'
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/debsources.vim b/uvim/runtime/syntax/debsources.mnv
index 76b52cfaa4..bc819e12d7 100644
--- a/uvim/runtime/syntax/debsources.vim
+++ b/uvim/runtime/syntax/debsources.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Debian sources.list
-" Maintainer:   Debian Vim Maintainers
+" Maintainer:   Debian MNV Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
 " Last Change: 2024 Jan 30
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/debsources.mnv
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -22,7 +22,7 @@ syn match debsourcesNonFreeComponent   /\<\(contrib\|non-free-firmware\|non-free
 syn match debsourcesComment        /#.*/  contains=@Spell
 
 " Include Debian versioning information
-runtime! syntax/shared/debversions.vim
+runtime! syntax/shared/debversions.mnv
 
 exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\<\('. join(g:debSharedSupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
 exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(g:debSharedUnsupportedVersions, '\|') .'\)\>\([-[:alnum:]_./]*\)+'
diff --git a/uvim/runtime/syntax/def.vim b/uvim/runtime/syntax/def.mnv
index a17714c41e..3e1dae8264 100644
--- a/uvim/runtime/syntax/def.vim
+++ b/uvim/runtime/syntax/def.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Microsoft Module-Definition (.def) File
 " Orig Author:	Rob Brady <robb@datatone.com>
 " Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
@@ -41,4 +41,4 @@ hi def link defOrdinal	Operator
 
 let b:current_syntax = "def"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/denyhosts.vim b/uvim/runtime/syntax/denyhosts.mnv
index f32faab168..5ab86dcd5e 100644
--- a/uvim/runtime/syntax/denyhosts.vim
+++ b/uvim/runtime/syntax/denyhosts.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             denyhosts configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-25
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword denyhostsTodo
       \ contained
diff --git a/uvim/runtime/syntax/dep3patch.vim b/uvim/runtime/syntax/dep3patch.mnv
index c00bddfde2..f7ae95a614 100644
--- a/uvim/runtime/syntax/dep3patch.vim
+++ b/uvim/runtime/syntax/dep3patch.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Debian DEP3 Patch headers
 " Maintainer:  Gabriel Filion <gabster@lelutin.ca>
 " Last Change: 2023 Jan 16
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/dep3patch.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/dep3patch.mnv
 "
 " Specification of the DEP3 patch header format is available at:
 "   https://dep-team.pages.debian.net/deps/dep3/
@@ -12,11 +12,11 @@ if exists('b:current_syntax')
   finish
 endif
 
-runtime! syntax/diff.vim
+runtime! syntax/diff.mnv
 unlet! b:current_syntax
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region dep3patchHeaders start="\%^" end="^\%(---\)\@=" contains=dep3patchKey,dep3patchMultiField
 
@@ -54,4 +54,4 @@ let b:current_syntax = 'dep3patch'
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/desc.vim b/uvim/runtime/syntax/desc.mnv
index 84b9cd0f34..4306cacce5 100644
--- a/uvim/runtime/syntax/desc.vim
+++ b/uvim/runtime/syntax/desc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	T2 / ROCK Linux .desc
 " Maintainer:	René Rebe <rene@exactcode.de>, Piotr Esden-Tempski <esden@rocklinux.org>
 " Last Change:	2006 Aug 14
diff --git a/uvim/runtime/syntax/desktop.vim b/uvim/runtime/syntax/desktop.mnv
index 461ba855b9..83974c5baa 100644
--- a/uvim/runtime/syntax/desktop.vim
+++ b/uvim/runtime/syntax/desktop.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language: XDG desktop entry
 " Filenames: *.desktop, *.directory
-" Maintainer: Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
+" Maintainer: Eisuke Kawashima ( e.kawaschima+mnv AT gmail.com )
 " Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Last Change: 2022 Sep 22
-" Version Info: desktop.vim 1.5
+" Version Info: desktop.mnv 1.5
 " References:
 " - https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.5.html (2020-04-27)
 " - https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-0.11.html (2006-02-07)
@@ -15,7 +15,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 syn case match
 
 " Variable {{{1
@@ -264,4 +264,4 @@ hi def link dtNonStdLabelKey	Type
 let b:current_syntax = "desktop"
 let &cpo = s:cpo_save
 
-" vim:ts=8:sw=2:fdm=marker
+" mnv:ts=8:sw=2:fdm=marker
diff --git a/uvim/runtime/syntax/dictconf.vim b/uvim/runtime/syntax/dictconf.mnv
index c762808c89..f6df279b99 100644
--- a/uvim/runtime/syntax/dictconf.vim
+++ b/uvim/runtime/syntax/dictconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             dict(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword dictconfTodo        contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/dictdconf.vim b/uvim/runtime/syntax/dictdconf.mnv
index ecf5fd346f..d9f21578ac 100644
--- a/uvim/runtime/syntax/dictdconf.vim
+++ b/uvim/runtime/syntax/dictdconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             dictd(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword dictdconfTodo        contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/diff.vim b/uvim/runtime/syntax/diff.mnv
index 71d2763bab..bf83781ccc 100644
--- a/uvim/runtime/syntax/diff.vim
+++ b/uvim/runtime/syntax/diff.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Diff (context or unified)
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 "		Translations by Jakson Alves de Aquino.
 " Last Change:	2025 Aug 16
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -387,4 +387,4 @@ hi def link diffComment		Comment
 
 let b:current_syntax = "diff"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/dircolors.vim b/uvim/runtime/syntax/dircolors.mnv
index 24bc31ff7e..4b27b7b1aa 100644
--- a/uvim/runtime/syntax/dircolors.vim
+++ b/uvim/runtime/syntax/dircolors.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:        dircolors(1) input file
 " Maintainer:      Jan Larres <jan@majutsushi.net>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax keyword dircolorsTodo    FIXME TODO XXX NOTE contained
 
diff --git a/uvim/runtime/syntax/dirpager.vim b/uvim/runtime/syntax/dirpager.mnv
index dc8b9867ab..379da76258 100644
--- a/uvim/runtime/syntax/dirpager.vim
+++ b/uvim/runtime/syntax/dirpager.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Maintainer:	  Thilo Six
-" Contact:	  <vim-dev at vim dot org>
-"		  http://www.vim.org/maillist.php#vim-dev
+" Contact:	  <mnv-dev at mnv dot org>
+"		  http://www.mnv.org/maillist.php#mnv-dev
 "
-" Description:	  display directory content inside Vim with syntax
+" Description:	  display directory content inside MNV with syntax
 "		  highlighting
-" File:		  runtime/syntax/dirpager.vim
+" File:		  runtime/syntax/dirpager.mnv
 " Last Change:	  2022 Jun 14
-" Modeline:	  vim: ts=8:sw=2:sts=2:
+" Modeline:	  mnv: ts=8:sw=2:sts=2:
 "
-" Credits:	  dirpager.vim is derived from Nikolai Weibulls dircolors.vim
+" Credits:	  dirpager.mnv is derived from Nikolai Weibulls dircolors.mnv
 "
-" License:	  VIM License
-"		  Vim is Charityware, see ":help Uganda"
+" License:	  MNV License
+"		  MNV is Charityware, see ":help Uganda"
 "
 " Usage:	  $ ls -la | view -c "set ft=dirpager" -
 "
diff --git a/uvim/runtime/syntax/diva.vim b/uvim/runtime/syntax/diva.mnv
index 127a0b4663..0de8ff5600 100644
--- a/uvim/runtime/syntax/diva.vim
+++ b/uvim/runtime/syntax/diva.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		SKILL for Diva
 " Maintainer:	Toby Schaffer <jtschaff@eos.ncsu.edu>
 " Last Change:	2001 May 09
@@ -9,9 +9,9 @@
 "				database. These items are for Diva verification rules decks.
 
 " Don't remove any old syntax stuff hanging around! We need stuff
-" from skill.vim.
+" from skill.mnv.
 if !exists("did_skill_syntax_inits")
-  runtime! syntax/skill.vim
+  runtime! syntax/skill.mnv
 endif
 
 syn keyword divaDRCKeywords		area enc notch ovlp sep width
@@ -93,4 +93,4 @@ hi def link divaGeomFunctions	Function
 
 let b:current_syntax = "diva"
 
-" vim:ts=4
+" mnv:ts=4
diff --git a/uvim/runtime/syntax/django.vim b/uvim/runtime/syntax/django.mnv
index 353221af08..176df7cc1e 100644
--- a/uvim/runtime/syntax/django.vim
+++ b/uvim/runtime/syntax/django.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Django template
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
 " Last Change:	2021 Nov 29
-" 2026 Feb 12 by Vim Project add partial support #19386
+" 2026 Feb 12 by MNV Project add partial support #19386
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/dns.vim b/uvim/runtime/syntax/dns.mnv
index cc9a3f0e96..bdb0b132f2 100644
--- a/uvim/runtime/syntax/dns.vim
+++ b/uvim/runtime/syntax/dns.mnv
@@ -1,5 +1,5 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     DNS/BIND Zone File
 
 " This has been replaced by the bindzone syntax
-:runtime! syntax/bindzone.vim
+:runtime! syntax/bindzone.mnv
diff --git a/uvim/runtime/syntax/dnsmasq.vim b/uvim/runtime/syntax/dnsmasq.mnv
index a4cc8b577b..eacab1efe9 100644
--- a/uvim/runtime/syntax/dnsmasq.vim
+++ b/uvim/runtime/syntax/dnsmasq.mnv
@@ -1,17 +1,17 @@
-" Vim syntax file
+" MNV syntax file
 " Maintainer:	Thilo Six
-" Contact:	vim-foo@xk2c-foo.de
+" Contact:	mnv-foo@xk2c-foo.de
 "		:3s+-foo++g
 " Description:	highlight dnsmasq configuration files
-" File:		runtime/syntax/dnsmasq.vim
+" File:		runtime/syntax/dnsmasq.mnv
 " Version:	2.76
 " Last Change:	2015 Sep 27
-" Modeline:	vim: ts=8:sw=2:sts=2:
+" Modeline:	mnv: ts=8:sw=2:sts=2:
 "
-" License:	VIM License
-"		Vim is Charityware, see ":help Uganda"
+" License:	MNV License
+"		MNV is Charityware, see ":help Uganda"
 "
-" Options:	You might want to add this to your vimrc:
+" Options:	You might want to add this to your mnvrc:
 "
 "		if &background == "dark"
 "		    let dnsmasq_backrgound_light = 0
@@ -26,7 +26,7 @@ if exists("b:current_syntax") || &compatible
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if !exists("b:dnsmasq_backrgound_light")
     if exists("dnsmasq_backrgound_light")
diff --git a/uvim/runtime/syntax/docbk.vim b/uvim/runtime/syntax/docbk.mnv
index 809f2894e6..bf3136bfb7 100644
--- a/uvim/runtime/syntax/docbk.vim
+++ b/uvim/runtime/syntax/docbk.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DocBook
-" Maintainer:	Devin Weaver <vim@tritarget.com>
+" Maintainer:	Devin Weaver <mnv@tritarget.com>
 " Last Updated By: Shlomi Fish
-" URL:		http://tritarget.com/pub/vim/syntax/docbk.vim
+" URL:		http://tritarget.com/pub/mnv/syntax/docbk.mnv
 " Last Change:	2012 Nov 28
 " Version:	1.2 (and modified after that)
 " Thanks to Johannes Zellner <johannes@zellner.org> for the default to XML
@@ -183,4 +183,4 @@ hi def link docbkCite	Constant
 
 let b:current_syntax = "docbk"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/docbksgml.vim b/uvim/runtime/syntax/docbksgml.mnv
index 544f3d290d..a6128870bd 100644
--- a/uvim/runtime/syntax/docbksgml.vim
+++ b/uvim/runtime/syntax/docbksgml.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DocBook SGML
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Sam, 07 Sep 2002 17:20:46 CEST
 
 let b:docbk_type="sgml"
-runtime syntax/docbk.vim
+runtime syntax/docbk.mnv
diff --git a/uvim/runtime/syntax/docbkxml.vim b/uvim/runtime/syntax/docbkxml.mnv
index 181af2cc80..27749fe5d7 100644
--- a/uvim/runtime/syntax/docbkxml.vim
+++ b/uvim/runtime/syntax/docbkxml.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DocBook XML
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Sam, 07 Sep 2002 17:20:12 CEST
 
 let b:docbk_type="xml"
-runtime syntax/docbk.vim
+runtime syntax/docbk.mnv
diff --git a/uvim/runtime/syntax/dockerfile.vim b/uvim/runtime/syntax/dockerfile.mnv
index f1d612f4ad..01ca14ea09 100644
--- a/uvim/runtime/syntax/dockerfile.vim
+++ b/uvim/runtime/syntax/dockerfile.mnv
@@ -1,4 +1,4 @@
-" dockerfile.vim - Syntax highlighting for Dockerfiles
+" dockerfile.mnv - Syntax highlighting for Dockerfiles
 " Maintainer:   Honza Pokorny <https://honza.ca>
 " Last Change:  2024 Dec 20
 " License:      BSD
@@ -9,10 +9,10 @@ if exists("b:current_syntax")
     finish
 endif
 
-syntax include @JSON syntax/json.vim
+syntax include @JSON syntax/json.mnv
 unlet b:current_syntax
 
-syntax include @Shell syntax/sh.vim
+syntax include @Shell syntax/sh.mnv
 unlet b:current_syntax
 
 syntax case ignore
diff --git a/uvim/runtime/syntax/dosbatch.vim b/uvim/runtime/syntax/dosbatch.mnv
index 0c3e99be3b..60057f2630 100644
--- a/uvim/runtime/syntax/dosbatch.vim
+++ b/uvim/runtime/syntax/dosbatch.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MS-DOS/Windows batch file (with NT command extensions)
 " Maintainer:	Mike Williams <mrmrdubya@gmail.com>
 " Filenames:    *.bat
 " Last Change:	3rd February 2024
-" 2024 Aug 14 by Vim Project: improve syntax (#15453)
+" 2024 Aug 14 by MNV Project: improve syntax (#15453)
 "
 " Options Flags:
 " dosbatch_cmdextversion	- 1 = Windows NT, 2 = Windows 2000 [default]
@@ -161,4 +161,4 @@ hi def link dosbatchCmd		PreProc
 
 let b:current_syntax = "dosbatch"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/dosini.vim b/uvim/runtime/syntax/dosini.mnv
index e8212b6d2e..2c6f7c96bc 100644
--- a/uvim/runtime/syntax/dosini.vim
+++ b/uvim/runtime/syntax/dosini.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:               Configuration File (ini file) for MSDOS/MS Windows
 " Version:                2.4
 " Original Author:        Sean M. McKee <mckee@misslink.net>
 " Previous Maintainer:    Nima Talebi <nima@it.net.au>
 " Current Maintainer:     Hong Xu <hong@topbug.net>
-" Homepage:               http://www.vim.org/scripts/script.php?script_id=3747
-" Repository:             https://github.com/xuhdev/syntax-dosini.vim
+" Homepage:               http://www.mnv.org/scripts/script.php?script_id=3747
+" Repository:             https://github.com/xuhdev/syntax-dosini.mnv
 " Last Change:            2024 Sept 08
 
 
@@ -14,9 +14,9 @@ if exists("b:current_syntax")
   finish
 endif
 
-" using of line-continuation requires cpo&vim
+" using of line-continuation requires cpo&mnv
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " shut case off
 syn case ignore
@@ -46,4 +46,4 @@ let b:current_syntax = "dosini"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: sts=2 sw=2 et
+" mnv: sts=2 sw=2 et
diff --git a/uvim/runtime/syntax/dot.vim b/uvim/runtime/syntax/dot.mnv
index 68a0f57a98..7365bb71f0 100644
--- a/uvim/runtime/syntax/dot.vim
+++ b/uvim/runtime/syntax/dot.mnv
@@ -1,7 +1,7 @@
 " Language:     Dot
 " Filenames:    *.dot
 " Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
-" URL:          http://www.ocaml.info/vim/syntax/dot.vim
+" URL:          http://www.ocaml.info/mnv/syntax/dot.mnv
 " Last Change:  2021 Mar 24 - better attr + escape string matching, new keywords (Farbod Salamat-Zadeh)
 "               2011 May 17 - improved identifier matching + two new keywords
 "               2001 May 04 - initial version
@@ -15,7 +15,7 @@ elseif exists("b:current_syntax")
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Errors
 syn match    dotParErr     ")"
@@ -118,4 +118,4 @@ let b:current_syntax = "dot"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/doxygen.vim b/uvim/runtime/syntax/doxygen.mnv
index 357c4302cf..4f5703e293 100644
--- a/uvim/runtime/syntax/doxygen.vim
+++ b/uvim/runtime/syntax/doxygen.mnv
@@ -1,6 +1,6 @@
 " DoxyGen syntax highlighting extension for c/c++/idl/java
 " Language:     doxygen on top of c, cpp, idl, java, php
-" Maintainer:   Michael Geddes <vimmer@frog.wheelycreek.net>
+" Maintainer:   Michael Geddes <mnvmer@frog.wheelycreek.net>
 " Author:       Michael Geddes
 " Last Change: December 2020
 " Version:      1.30
@@ -52,7 +52,7 @@ endif
 
 let s:cpo_save = &cpo
 try
-  set cpo&vim
+  set cpo&mnv
 
   " Start of Doxygen syntax highlighting:
   "
@@ -223,7 +223,7 @@ endif
     unlet b:current_syntax
   endif
 
-  syn include @Dotx syntax/dot.vim
+  syn include @Dotx syntax/dot.mnv
 
   if exists('b:doxygen_syntax_save')
     let b:current_syntax=b:doxygen_syntax_save
@@ -630,4 +630,4 @@ finally
   unlet s:cpo_save
 endtry
 let suppress_doxygen=1
-" vim:et sw=2 sts=2
+" mnv:et sw=2 sts=2
diff --git a/uvim/runtime/syntax/dracula.vim b/uvim/runtime/syntax/dracula.mnv
index a373dc200c..afcf424c37 100644
--- a/uvim/runtime/syntax/dracula.vim
+++ b/uvim/runtime/syntax/dracula.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Dracula
 " Maintainer:	Scott Bordelon <slb@artisan.com>
 " Last change:  Wed Apr 25 18:50:01 PDT 2001
@@ -69,4 +69,4 @@ hi def link draculaPreProc    PreProc
 
 let b:current_syntax = "dracula"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/dsl.vim b/uvim/runtime/syntax/dsl.mnv
index 95c7843140..f7836e1e3b 100644
--- a/uvim/runtime/syntax/dsl.vim
+++ b/uvim/runtime/syntax/dsl.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	DSSSL
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Tue, 27 Apr 2004 14:54:59 CEST
 " Filenames:	*.dsl
-" $Id: dsl.vim,v 1.1 2004/06/13 19:13:31 vimboss Exp $
+" $Id: dsl.mnv,v 1.1 2004/06/13 19:13:31 mnvboss Exp $
 
 if exists("b:current_syntax") | finish | endif
 
-runtime syntax/xml.vim
+runtime syntax/xml.mnv
 syn cluster xmlRegionHook add=dslRegion,dslComment
 syn cluster xmlCommentHook add=dslCond
 
diff --git a/uvim/runtime/syntax/dtd.vim b/uvim/runtime/syntax/dtd.mnv
index 58f07c98dd..5c21b25171 100644
--- a/uvim/runtime/syntax/dtd.vim
+++ b/uvim/runtime/syntax/dtd.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: DTD (Document Type Definition for XML)
 " Maintainer: Christian Brabandt <cb@256bit.org>
-" Repository: https://github.com/chrisbra/vim-xml-ftplugin
+" Repository: https://github.com/chrisbra/mnv-xml-ftplugin
 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
 " Author: Daniel Amyot <damyot@site.uottawa.ca>
 " Last Changed:	Sept 24, 2019
@@ -18,7 +18,7 @@ if exists("b:current_syntax")
     finish
 endif
 let s:dtd_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if !exists("dtd_ignore_case")
     " I prefer having the case takes into consideration.
@@ -158,4 +158,4 @@ unlet s:dtd_cpo_save
 
 let b:current_syntax = "dtd"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/dtml.vim b/uvim/runtime/syntax/dtml.mnv
index cb09de8091..0f89025c50 100644
--- a/uvim/runtime/syntax/dtml.vim
+++ b/uvim/runtime/syntax/dtml.mnv
@@ -3,7 +3,7 @@
 " Maintainer:	    Jean Jordaan <jean@upfrontsystems.co.za> (njj)
 " Last change:	    2001 Sep 02
 
-" These are used with Claudio Fleiner's html.vim in the standard distribution.
+" These are used with Claudio Fleiner's html.mnv in the standard distribution.
 "
 " Still very hackish. The 'dtml attributes' and 'dtml methods' have been
 " hacked out of the Zope Quick Reference in case someone finds something
@@ -15,7 +15,7 @@ if exists("b:current_syntax")
 endif
 
 " First load the HTML syntax
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 
 syn case match
 
@@ -205,4 +205,4 @@ let b:current_syntax = "dtml"
 "   unlet main_syntax
 " endif
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/dtrace.vim b/uvim/runtime/syntax/dtrace.mnv
index 392fa1c1c9..c522196e40 100644
--- a/uvim/runtime/syntax/dtrace.vim
+++ b/uvim/runtime/syntax/dtrace.mnv
@@ -1,5 +1,5 @@
 " DTrace D script syntax file. To avoid confusion with the D programming
-" language, I call this script dtrace.vim instead of d.vim.
+" language, I call this script dtrace.mnv instead of d.mnv.
 " Language: D script as described in "Solaris Dynamic Tracing Guide",
 "           http://docs.sun.com/app/docs/doc/817-6223
 " Version: 1.5
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 
 syn clear cCommentL  " dtrace doesn't support // style comments
diff --git a/uvim/runtime/syntax/dts.vim b/uvim/runtime/syntax/dts.mnv
index bb7eff7be1..3abfacd5e2 100644
--- a/uvim/runtime/syntax/dts.vim
+++ b/uvim/runtime/syntax/dts.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	dts/dtsi (device tree files)
-" Maintainer:	Daniel Mack <vim@zonque.org>
+" Maintainer:	Daniel Mack <mnv@zonque.org>
 " Last Change:	2023 Apr 28
 
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/dune.vim b/uvim/runtime/syntax/dune.mnv
index 3cfb47fbee..db22a1ebc0 100644
--- a/uvim/runtime/syntax/dune.vim
+++ b/uvim/runtime/syntax/dune.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Dune buildsystem
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 "              Anton Kochkov       <anton.kochkov@gmail.com>
-" URL:         https://github.com/ocaml/vim-ocaml
+" URL:         https://github.com/ocaml/mnv-ocaml
 " Last Change:
 "              2023 Nov 24 - Add end-of-line strings (Samuel Hym)
 "              2019 Feb 27 - Add newer keywords to the syntax (Simon Cruanes)
diff --git a/uvim/runtime/syntax/dylan.vim b/uvim/runtime/syntax/dylan.mnv
index 345e932e60..3b48bddb21 100644
--- a/uvim/runtime/syntax/dylan.vim
+++ b/uvim/runtime/syntax/dylan.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Dylan
 " Authors:	Justus Pendleton <justus@acm.org>
 "		Brent A. Fulgham <bfulgham@debian.org>
@@ -89,4 +89,4 @@ hi def link dylanVariable		Identifier
 
 let b:current_syntax = "dylan"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/dylanintr.vim b/uvim/runtime/syntax/dylanintr.mnv
index 692db34985..f64e15e14a 100644
--- a/uvim/runtime/syntax/dylanintr.vim
+++ b/uvim/runtime/syntax/dylanintr.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Dylan
 " Authors:	Justus Pendleton <justus@acm.org>
 " Last Change:	Fri Sep 29 13:53:27 PDT 2000
@@ -36,4 +36,4 @@ hi def link dylanintrInclude	Include
 
 let b:current_syntax = "dylanintr"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/dylanlid.vim b/uvim/runtime/syntax/dylanlid.mnv
index dae0bf94b1..aa461ce914 100644
--- a/uvim/runtime/syntax/dylanlid.vim
+++ b/uvim/runtime/syntax/dylanlid.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Dylan Library Interface Files
 " Authors:	Justus Pendleton <justus@acm.org>
 "		Brent Fulgham <bfulgham@debian.org>
@@ -26,4 +26,4 @@ hi def link dylanlidEntry		String
 
 let b:current_syntax = "dylanlid"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/ecd.vim b/uvim/runtime/syntax/ecd.mnv
index 1276f2bd9d..be703fafd5 100644
--- a/uvim/runtime/syntax/ecd.vim
+++ b/uvim/runtime/syntax/ecd.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ecd (Embedix Component Description) files
 " Maintainer:	John Beppu <beppu@opensource.lineo.com>
-" URL:		http://opensource.lineo.com/~beppu/prose/ecd_vim.html
+" URL:		http://opensource.lineo.com/~beppu/prose/ecd_mnv.html
 " Last Change:	2001 Sep 27
 
 " An ECD file contains meta-data for packages in the Embedix Linux distro.
-" This syntax file was derived from apachestyle.vim
+" This syntax file was derived from apachestyle.mnv
 " by Christian Hammers <ch@westend.com>
 
 " quit when a syntax file was already loaded
@@ -41,4 +41,4 @@ hi def link ecdTagError	Error
 
 
 let b:current_syntax = "ecd"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/edif.vim b/uvim/runtime/syntax/edif.mnv
index 002c9f89e1..1cda23d0f6 100644
--- a/uvim/runtime/syntax/edif.vim
+++ b/uvim/runtime/syntax/edif.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     EDIF (Electronic Design Interchange Format)
 " Maintainer:   Artem Zankovich <z_artem@hotbox.ru>
 " Last Change:  Oct 14, 2002
diff --git a/uvim/runtime/syntax/editorconfig.vim b/uvim/runtime/syntax/editorconfig.mnv
index 7f75ab6287..22f5ed8df9 100644
--- a/uvim/runtime/syntax/editorconfig.vim
+++ b/uvim/runtime/syntax/editorconfig.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     EditorConfig
 " Maintainer:   Gregory Anders <greg@gpanders.com>
 " Last Change:  2023-07-20
@@ -7,7 +7,7 @@ if exists('b:current_syntax')
   finish
 endif
 
-runtime! syntax/dosini.vim
+runtime! syntax/dosini.mnv
 unlet! b:current_syntax
 
 syntax match editorconfigUnknownProperty "^\s*\zs[a-zA-Z0-9_-]\+\ze\s*="
diff --git a/uvim/runtime/syntax/eiffel.vim b/uvim/runtime/syntax/eiffel.mnv
index c6634871cc..21b1bb69b4 100644
--- a/uvim/runtime/syntax/eiffel.vim
+++ b/uvim/runtime/syntax/eiffel.mnv
@@ -4,14 +4,14 @@
 " Previous maintainer:	Reimer Behrends <behrends@cse.msu.edu>
 " Contributions from: Thilo Six
 " 
-" URL: https://github.com/eiffelhub/vim-eiffel
+" URL: https://github.com/eiffelhub/mnv-eiffel
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Option handling
 
@@ -196,4 +196,4 @@ let b:current_syntax = "eiffel"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/elf.vim b/uvim/runtime/syntax/elf.mnv
index c8e5a61bd1..3486fe8c10 100644
--- a/uvim/runtime/syntax/elf.vim
+++ b/uvim/runtime/syntax/elf.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    ELF
 " Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change: Son 22 Jun 2003 20:43:14 CEST
 " Filenames:   *.ab,*.am
-" URL:	       http://www.cvjb.de/comp/vim/elf.vim
-" $Id: elf.vim,v 1.1 2004/06/13 19:52:27 vimboss Exp $
+" URL:	       http://www.cvjb.de/comp/mnv/elf.mnv
+" $Id: elf.mnv,v 1.1 2004/06/13 19:52:27 mnvboss Exp $
 "
 " ELF: Extensible Language Facility
 "      This is the Applix Inc., Macro and Builder programming language.
@@ -79,4 +79,4 @@ hi def link elfPunct Delimiter
 
 let b:current_syntax = "elf"
 
-" vim:ts=8:sw=4:nocindent:smartindent:
+" mnv:ts=8:sw=4:nocindent:smartindent:
diff --git a/uvim/runtime/syntax/elinks.vim b/uvim/runtime/syntax/elinks.mnv
index 98252a24d3..37d972d042 100644
--- a/uvim/runtime/syntax/elinks.vim
+++ b/uvim/runtime/syntax/elinks.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             elinks(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/elm.vim b/uvim/runtime/syntax/elm.mnv
index 1277827f57..9b67464c99 100644
--- a/uvim/runtime/syntax/elm.vim
+++ b/uvim/runtime/syntax/elm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Elm
 " Maintainer: Andreas Scharf <as@99n.de>
 " Original Author: Joseph Hager <ajhager@gmail.com>
diff --git a/uvim/runtime/syntax/elmfilt.vim b/uvim/runtime/syntax/elmfilt.mnv
index aa1b57cbfe..93729e92da 100644
--- a/uvim/runtime/syntax/elmfilt.vim
+++ b/uvim/runtime/syntax/elmfilt.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Elm Filter rules
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Aug 31, 2016
 " Version:	9
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_ELMFILT
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -56,4 +56,4 @@ if !exists("skip_elmfilt_syntax_inits")
 endif
 
 let b:current_syntax = "elmfilt"
-" vim: ts=9
+" mnv: ts=9
diff --git a/uvim/runtime/syntax/env.vim b/uvim/runtime/syntax/env.mnv
index a33eb045da..9bd9a2c133 100644
--- a/uvim/runtime/syntax/env.vim
+++ b/uvim/runtime/syntax/env.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    env
 " Maintainer:  DuckAfire <duckafire@gmail.com>
 " Last Change: 2026 Jan 27
diff --git a/uvim/runtime/syntax/erlang.vim b/uvim/runtime/syntax/erlang.mnv
index bbb03d52cd..52952a6e61 100644
--- a/uvim/runtime/syntax/erlang.vim
+++ b/uvim/runtime/syntax/erlang.mnv
@@ -1,27 +1,27 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Contributor:  Adam Rutkowski <hq@mtod.org>
 "               Johannes Christ <jc@jchri.st>
 " Last Update:  2025-Nov-12
-" License:      Vim license
-" URL:          https://github.com/vim-erlang/vim-erlang-runtime
+" License:      MNV license
+" URL:          https://github.com/mnv-erlang/mnv-erlang-runtime
 
 " Acknowledgements: This script was originally created by Kresimir Marzic [1].
 " The script was then revamped by Csaba Hoch [2]. During the revamp, the new
 " highlighting style and some code was taken from the Erlang syntax script
-" that is part of vimerl [3], created by Oscar Hellström [4] and improved by
+" that is part of mnverl [3], created by Oscar Hellström [4] and improved by
 " Ricardo Catalinas Jiménez [5].
 
 " [1]: Kreąimir Marľić (Kresimir Marzic) <kmarzic@fly.srk.fer.hr>
 " [2]: Csaba Hoch <csaba.hoch@gmail.com>
-" [3]: https://github.com/jimenezrick/vimerl
+" [3]: https://github.com/jimenezrick/mnverl
 " [4]: Oscar Hellström <oscar@oscarh.net> (http://oscar.hellstrom.st)
 " [5]: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 " Customization:
 "
-" To use the old highlighting style, add this to your .vimrc:
+" To use the old highlighting style, add this to your .mnvrc:
 "
 "     let g:erlang_old_style_highlight = 1
 
@@ -32,23 +32,23 @@ endif
 
 if !exists('g:main_syntax')
   " This is an Erlang source file, and this is the main execution of
-  " syntax/erlang.vim.
+  " syntax/erlang.mnv.
   let g:main_syntax = 'erlang'
 elseif g:main_syntax == 'erlang'
   " This is an Erlang source file, and this is an inner execution of
-  " syntax/erlang.vim. For example:
+  " syntax/erlang.mnv. For example:
   "
-  " 1.  The main execution of syntax/erlang.vim included syntax/markdown.vim
+  " 1.  The main execution of syntax/erlang.mnv included syntax/markdown.mnv
   "     because "g:erlang_use_markdown_for_docs == 1".
   "
-  " 2.  syntax/markdown.vim included syntax/erlang.vim because
+  " 2.  syntax/markdown.mnv included syntax/erlang.mnv because
   "     "g:markdown_fenced_languages == ['erlang']". This is the inner
-  "     execution of syntax/erlang.vim.
+  "     execution of syntax/erlang.mnv.
   "
   " To avoid infinite recursion with Markdown and Erlang including each other,
-  " and to avoid the inner syntax/erlang.vim execution messing up the
-  " variables of the outer erlang.vim execution, we finish executing the inner
-  " erlang.vim.
+  " and to avoid the inner syntax/erlang.mnv execution messing up the
+  " variables of the outer erlang.mnv execution, we finish executing the inner
+  " erlang.mnv.
   "
   " In the inner execution, we already have the Erlang syntax items included,
   " so the highlighting of Erlang within Markdown within Erlang will be
@@ -58,7 +58,7 @@ elseif g:main_syntax == 'erlang'
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " "g:erlang_old_style_highlight": Whether to use old style highlighting.
 "
@@ -79,9 +79,9 @@ let s:old_style = (exists("g:erlang_old_style_highlight") &&
 "     highlighting in docstrings.
 "
 " If "g:main_syntax" is not 'erlang', this is not an Erlang source file but
-" for example a Markdown file, and syntax/markdown.vim is including
-" syntax/erlang.vim. To avoid infinite recursion with Markdown and Erlang
-" including each other, we disable sourcing syntax/markdown.vim in this case.
+" for example a Markdown file, and syntax/markdown.mnv is including
+" syntax/erlang.mnv. To avoid infinite recursion with Markdown and Erlang
+" including each other, we disable sourcing syntax/markdown.mnv in this case.
 if exists("g:erlang_use_markdown_for_docs") && g:main_syntax == 'erlang'
   let s:use_markdown = g:erlang_use_markdown_for_docs
 else
@@ -271,10 +271,10 @@ if s:use_markdown
   " triple-quoted strings).
   unlet! b:current_syntax
 
-  syn include @markdown syntax/markdown.vim
+  syn include @markdown syntax/markdown.mnv
   let b:current_syntax = "erlang"
 
-  " markdown-erlang.vim includes html.vim, which includes css.vim, which adds
+  " markdown-erlang.mnv includes html.mnv, which includes css.mnv, which adds
   " the dash character (-) to the list of syntax keywords, which causes
   " `-VarName` not to be highlighted as a variable in the Erlang code.
   "
@@ -405,4 +405,4 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: sw=2 et
+" mnv: sw=2 et
diff --git a/uvim/runtime/syntax/eruby.vim b/uvim/runtime/syntax/eruby.mnv
index 469408752e..b5f01dbcb8 100644
--- a/uvim/runtime/syntax/eruby.vim
+++ b/uvim/runtime/syntax/eruby.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		eRuby
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" Maintainer:		Tim Pope <mnvNOSPAM@tpope.org>
+" URL:			https://github.com/mnv-ruby/mnv-ruby
 " Last Change:		2022 Mar 18
 
 if exists("b:current_syntax")
@@ -52,10 +52,10 @@ if !b:eruby_nest_level
 endif
 
 if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby'
-  exe "runtime! syntax/".b:eruby_subtype.".vim"
+  exe "runtime! syntax/".b:eruby_subtype.".mnv"
   unlet! b:current_syntax
 endif
-syn include @rubyTop syntax/ruby.vim
+syn include @rubyTop syntax/ruby.mnv
 
 syn cluster erubyRegions contains=erubyOneLiner,erubyBlock,erubyExpression,erubyComment
 
@@ -75,4 +75,4 @@ if main_syntax == 'eruby'
   unlet main_syntax
 endif
 
-" vim: nowrap sw=2 sts=2 ts=8:
+" mnv: nowrap sw=2 sts=2 ts=8:
diff --git a/uvim/runtime/syntax/esmtprc.vim b/uvim/runtime/syntax/esmtprc.mnv
index 81f074b59c..b50e878a18 100644
--- a/uvim/runtime/syntax/esmtprc.vim
+++ b/uvim/runtime/syntax/esmtprc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Esmtp setup file (based on esmtp 0.5.0)
 " Maintainer:	Kornel Kielczewski <kornel@gazeta.pl>
 " Last Change:	16 Feb 2005
diff --git a/uvim/runtime/syntax/esqlc.vim b/uvim/runtime/syntax/esqlc.mnv
index 792e5d37f3..62bc235e5b 100644
--- a/uvim/runtime/syntax/esqlc.vim
+++ b/uvim/runtime/syntax/esqlc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ESQL-C
 " Maintainer:	Jonathan A. George <jageorge@tel.gte.com>
 " Last Change:	2001 May 09
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 
 " ESQL-C extentions
 
diff --git a/uvim/runtime/syntax/esterel.vim b/uvim/runtime/syntax/esterel.mnv
index b0105216d7..f22630a842 100644
--- a/uvim/runtime/syntax/esterel.vim
+++ b/uvim/runtime/syntax/esterel.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:			ESTEREL
 " Maintainer:		Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
 " Credits:			Luca Necchi	<luca.necchi@polito.it>, Nikos Andrikos <nick.andrik@gmail.com>
diff --git a/uvim/runtime/syntax/eterm.vim b/uvim/runtime/syntax/eterm.mnv
index 9b43cb255f..c83be92ff2 100644
--- a/uvim/runtime/syntax/eterm.vim
+++ b/uvim/runtime/syntax/eterm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             eterm(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-21
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword etermTodo             contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/euphoria3.vim b/uvim/runtime/syntax/euphoria3.mnv
index ece14027ba..ee836c7eeb 100644
--- a/uvim/runtime/syntax/euphoria3.vim
+++ b/uvim/runtime/syntax/euphoria3.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Euphoria 3.1.1 - supports DOS - (http://www.rapideuphoria.com/)
 " Maintainer:	Shian Lee  
-" Last Change:	2014 Feb 24 (for Vim 7.4)
-" Remark:       Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; 
+" Last Change:	2014 Feb 24 (for MNV 7.4)
+" Remark:       Euphoria has two syntax files, euphoria3.mnv and euphoria4.mnv; 
 "               For details see :help ft-euphoria-syntax
 
 " quit when a syntax file was already loaded
@@ -10,9 +10,9 @@ if exists("b:current_syntax")
   finish
 endif
 
-" Reset compatible-options to Vim default value, just in case: 
+" Reset compatible-options to MNV default value, just in case: 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Should suffice for very long expressions:
 syn sync lines=40
diff --git a/uvim/runtime/syntax/euphoria4.vim b/uvim/runtime/syntax/euphoria4.mnv
index baa0e8e7b9..331a193d86 100644
--- a/uvim/runtime/syntax/euphoria4.vim
+++ b/uvim/runtime/syntax/euphoria4.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Euphoria 4.0.5 (http://www.openeuphoria.org/)
 " Maintainer:	Shian Lee  
-" Last Change:	2014 Feb 26 (for Vim 7.4)
-" Remark:       Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; 
+" Last Change:	2014 Feb 26 (for MNV 7.4)
+" Remark:       Euphoria has two syntax files, euphoria3.mnv and euphoria4.mnv; 
 "               For details see :help ft-euphoria-syntax
 
 " quit when a syntax file was already loaded
@@ -10,9 +10,9 @@ if exists("b:current_syntax")
   finish
 endif
 
-" Reset compatible-options to Vim default value, just in case: 
+" Reset compatible-options to MNV default value, just in case: 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Should suffice for very long strings and expressions:
 syn sync lines=40
diff --git a/uvim/runtime/syntax/eviews.vim b/uvim/runtime/syntax/eviews.mnv
index 03cfb25e60..82cb5d3341 100644
--- a/uvim/runtime/syntax/eviews.vim
+++ b/uvim/runtime/syntax/eviews.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Eviews (http://www.eviews.com)
 " Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
 " Last Change:  2006 Apr 30
 " Filenames:	*.prg
-" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim
+" URL:	http://uosis.mif.vu.lt/~zemlys/mnv-syntax/eviews.mnv
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
@@ -84,4 +84,4 @@ hi def link eParenError  Error
 
 let b:current_syntax="eviews"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/exim.vim b/uvim/runtime/syntax/exim.mnv
index 4edc0d7948..cb7646d56b 100644
--- a/uvim/runtime/syntax/exim.vim
+++ b/uvim/runtime/syntax/exim.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: Exim configuration file exim.conf
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2002-10-15
-" URL: http://trific.ath.cx/Ftp/vim/syntax/exim.vim
+" URL: http://trific.ath.cx/Ftp/mnv/syntax/exim.mnv
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/expect.vim b/uvim/runtime/syntax/expect.mnv
index 75cbd3eddf..6a26a35e01 100644
--- a/uvim/runtime/syntax/expect.vim
+++ b/uvim/runtime/syntax/expect.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Expect
 " Maintainer:	Ralph Jennings <knowbudy@oro.net>
 " Last Change:	2012 Jun 01
@@ -100,4 +100,4 @@ hi def link expectTodo		Todo
 
 let b:current_syntax = "expect"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/exports.vim b/uvim/runtime/syntax/exports.mnv
index 00b7d80dfa..d814072ab6 100644
--- a/uvim/runtime/syntax/exports.vim
+++ b/uvim/runtime/syntax/exports.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	exports
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Aug 31, 2016
 " Version:	8
 " Notes:		This file includes both SysV and BSD 'isms
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_EXPORTS
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -56,4 +56,4 @@ if !exists("skip_exports_syntax_inits")
 endif
 
 let b:current_syntax = "exports"
-" vim: ts=10
+" mnv: ts=10
diff --git a/uvim/runtime/syntax/falcon.vim b/uvim/runtime/syntax/falcon.mnv
index e022c7a54a..48c89e1d8d 100644
--- a/uvim/runtime/syntax/falcon.vim
+++ b/uvim/runtime/syntax/falcon.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Falcon
 " Maintainer:   Steven Oliver <oliver.steven@gmail.com>
-" Website:      http://github.com/steveno/vim-files/blob/master/syntax/falcon.vim
-" Credits:      Thanks the ruby.vim authors, I borrowed a lot!
+" Website:      http://github.com/steveno/mnv-files/blob/master/syntax/falcon.mnv
+" Credits:      Thanks the ruby.mnv authors, I borrowed a lot!
 "               Thanks to the lisp authors for the rainbow code!
 " -------------------------------------------------------------------------------
 
@@ -193,5 +193,5 @@ endif
 
 let b:current_syntax = "falcon"
 
-" vim: set sw=4 sts=4 et tw=80 :
+" mnv: set sw=4 sts=4 et tw=80 :
 
diff --git a/uvim/runtime/syntax/fan.vim b/uvim/runtime/syntax/fan.mnv
index fc193af062..1df0acc81d 100644
--- a/uvim/runtime/syntax/fan.vim
+++ b/uvim/runtime/syntax/fan.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Fantom
 " Maintainer:   Kamil Toman <kamil.toman@gmail.com>
 " Last Change:  2010 May 27
@@ -129,4 +129,4 @@ hi def link fanSpaceError		Error
 
 let b:current_syntax = "fan"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/fasm.vim b/uvim/runtime/syntax/fasm.mnv
index 172ba7c9b6..801d1ebf8e 100644
--- a/uvim/runtime/syntax/fasm.vim
+++ b/uvim/runtime/syntax/fasm.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Flat Assembler (FASM)
 " Maintainer:	Ron Aaron <ron@ronware.org>
 " Last Change:	2012/02/13
-" Vim URL:	http://www.vim.org/lang.html
+" MNV URL:	http://www.mnv.org/lang.html
 " FASM Home:	http://flatassembler.net/
 " FASM Version: 1.56
 
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword=a-z,A-Z,48-57,.,_
 setlocal isident=a-z,A-Z,48-57,.,_
@@ -148,4 +148,4 @@ let b:current_syntax = "fasm"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=8 :
+" mnv: ts=8 sw=8 :
diff --git a/uvim/runtime/syntax/fdcc.vim b/uvim/runtime/syntax/fdcc.mnv
index f7b296b9c6..e4e8a8da83 100644
--- a/uvim/runtime/syntax/fdcc.vim
+++ b/uvim/runtime/syntax/fdcc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	fdcc or locale files
 " Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
 " Last Change:	2004 May 16
@@ -98,4 +98,4 @@ hi def link fdccKeyword		   Identifier
 
 let b:current_syntax = "fdcc"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/fetchmail.vim b/uvim/runtime/syntax/fetchmail.mnv
index 50d6b82562..b5d78f7cab 100644
--- a/uvim/runtime/syntax/fetchmail.vim
+++ b/uvim/runtime/syntax/fetchmail.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		fetchmail(1) RC File
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword fetchmailTodo	contained FIXME TODO XXX NOTE
 
diff --git a/uvim/runtime/syntax/fgl.vim b/uvim/runtime/syntax/fgl.mnv
index 1b75d137b6..08cc8adb7b 100644
--- a/uvim/runtime/syntax/fgl.vim
+++ b/uvim/runtime/syntax/fgl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Informix 4GL
 " Maintainer:	Rafal M. Sulejman <rms@poczta.onet.pl>
 " Update:	26 Sep 2002
@@ -131,4 +131,4 @@ hi def link fglType	Type
 
 let b:current_syntax = "fgl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/fish.vim b/uvim/runtime/syntax/fish.mnv
index 266878bbdc..c77bfae6d1 100644
--- a/uvim/runtime/syntax/fish.vim
+++ b/uvim/runtime/syntax/fish.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     fish
 " Maintainer:   Nicholas Boyle (github.com/nickeb96)
-" Repository:   https://github.com/nickeb96/fish.vim
+" Repository:   https://github.com/nickeb96/fish.mnv
 " Last Change:  February 1, 2023
 
 if exists("b:current_syntax")
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 
 " Statements
diff --git a/uvim/runtime/syntax/flexwiki.vim b/uvim/runtime/syntax/flexwiki.mnv
index 3b5f7ff573..bdb4dfc4dd 100644
--- a/uvim/runtime/syntax/flexwiki.vim
+++ b/uvim/runtime/syntax/flexwiki.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     FlexWiki, http://www.flexwiki.com/
 " Maintainer:   George V. Reilly  <george@reilly.org>
-" Home:         http://www.georgevreilly.com/vim/flexwiki/
-" Other Home:   http://www.vim.org/scripts/script.php?script_id=1529
+" Home:         http://www.georgevreilly.com/mnv/flexwiki/
+" Other Home:   http://www.mnv.org/scripts/script.php?script_id=1529
 " Author:       George V. Reilly
 " Filenames:    *.wiki
 " Last Change: Wed Apr 26 11:00 PM 2006 P
@@ -11,7 +11,7 @@
 " Note: The horrible regexps were reverse-engineered from
 " FlexWikiCore\EngineSource\Formatter.cs, with help from the Regex Analyzer
 " in The Regulator, http://regulator.sourceforge.net/  .NET uses Perl-style
-" regexes, which use a different syntax than Vim (fewer \s).
+" regexes, which use a different syntax than MNV (fewer \s).
 " The primary test case is FlexWiki\FormattingRules.wiki
 
 " quit when a syntax file was already loaded
@@ -130,4 +130,4 @@ hi def link flexwikiSingleLineProperty    Identifier
 
 let b:current_syntax="FlexWiki"
 
-" vim:tw=0:
+" mnv:tw=0:
diff --git a/uvim/runtime/syntax/focexec.vim b/uvim/runtime/syntax/focexec.mnv
index 187fd50dbf..ae17955ae1 100644
--- a/uvim/runtime/syntax/focexec.vim
+++ b/uvim/runtime/syntax/focexec.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Focus Executable
 " Maintainer:	Rob Brady <robb@datatone.com>
 " Last Change:	$Date: 2004/06/13 15:38:04 $
-" URL:		http://www.datatone.com/~robb/vim/syntax/focexec.vim
+" URL:		http://www.datatone.com/~robb/mnv/syntax/focexec.mnv
 " $Revision: 1.1 $
 
 " this is a very simple syntax file - I will be improving it
@@ -85,4 +85,4 @@ hi def link focexecFuse		Function
 
 let b:current_syntax = "focexec"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/form.vim b/uvim/runtime/syntax/form.mnv
index 9718480da3..d750b2e3ff 100644
--- a/uvim/runtime/syntax/form.vim
+++ b/uvim/runtime/syntax/form.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	FORM
 " Version: 2.0
 " Maintainer:	Michael M. Tung <michael.tung@uni-mainz.de>
@@ -132,7 +132,7 @@ hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
 else
 hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 endif
-" change slightly the default for dark gvim
+" change slightly the default for dark gmnv
 if has("gui_running") && &background == "dark"
 hi Conditional guifg=LightBlue gui=bold
 hi Statement guifg=LightYellow
@@ -142,4 +142,4 @@ endif
 
   let b:current_syntax = "form"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/forth.vim b/uvim/runtime/syntax/forth.mnv
index 252116a187..fa12b95e8a 100644
--- a/uvim/runtime/syntax/forth.vim
+++ b/uvim/runtime/syntax/forth.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Forth
 " Maintainer:		Johan Kotlinski <kotlinski@gmail.com>
 " Previous Maintainer:	Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change:		2023 Aug 13
 " Filenames:		*.f,*.fs,*.ft,*.fth,*.4th
-" URL:			https://github.com/jkotlinski/forth.vim
+" URL:			https://github.com/jkotlinski/forth.mnv
 
 " Supports the Forth-2012 Standard.
 "
@@ -22,7 +22,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Synchronization method
 exe "syn sync minlines=" .. get(g:, "forth_minlines", 50)
@@ -451,5 +451,5 @@ let b:current_syntax = "forth"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8:sw=4:nocindent:smartindent:fdm=marker:tw=78
+" mnv:ts=8:sw=4:nocindent:smartindent:fdm=marker:tw=78
 
diff --git a/uvim/runtime/syntax/fortran.vim b/uvim/runtime/syntax/fortran.mnv
index 8167e4d737..31882bce25 100644
--- a/uvim/runtime/syntax/fortran.vim
+++ b/uvim/runtime/syntax/fortran.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Fortran 2023 (and Fortran 2018, 2008, 2003, 95, 90, and 77)
 " Version:	(v113) 2024 February 01
 " Maintainers:	Ajit J. Thakkar <ajit@unb.ca>; <https://ajit.ext.unb.ca/>
 " 	        Joshua Hollett <j.hollett@uwinnipeg.ca>
-" Usage:	For instructions, do :help fortran-syntax from Vim
+" Usage:	For instructions, do :help fortran-syntax from MNV
 " Credits:
 "  Version 0.1 for Fortran 95 was created in April 2000 by Ajit Thakkar from an
 "  older Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
@@ -20,7 +20,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Choose between fixed and free source form if this hasn't been done yet
 if !exists("b:fortran_fixed_source")
@@ -487,4 +487,4 @@ let b:current_syntax = "fortran"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8 tw=132
+" mnv: ts=8 tw=132
diff --git a/uvim/runtime/syntax/foxpro.vim b/uvim/runtime/syntax/foxpro.mnv
index 795859eac9..4cb1e0df73 100644
--- a/uvim/runtime/syntax/foxpro.vim
+++ b/uvim/runtime/syntax/foxpro.mnv
@@ -1,5 +1,5 @@
-" Vim syntax file
-" Filename:     foxpro.vim
+" MNV syntax file
+" Filename:     foxpro.mnv
 " Version:      1.0
 " Language:     FoxPro for DOS/UNIX v2.6
 " Maintainer:   Bill W. Smith, Jr. <donal@brewich.com>
diff --git a/uvim/runtime/syntax/fpcmake.vim b/uvim/runtime/syntax/fpcmake.mnv
index bbc6f1d770..2b36d92171 100644
--- a/uvim/runtime/syntax/fpcmake.vim
+++ b/uvim/runtime/syntax/fpcmake.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Free Pascal Makefile Definition Files
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2021 Apr 23
@@ -7,10 +7,10 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/make.vim
+runtime! syntax/make.mnv
 
 " NOTE: using start-of-line anchored syn-match groups is simpler than other
-"	alternatives when interacting with the sourced make.vim syntax groups
+"	alternatives when interacting with the sourced make.mnv syntax groups
 
 " Sections
 syn region fpcmakeSection matchgroup=fpcmakeSectionDelimiter start="^\s*\[" end="]" contains=fpcmakeSectionName
@@ -55,4 +55,4 @@ hi def link fpcmakeRule			Identifier
 
 let b:current_syntax = "fpcmake"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet:
+" mnv: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/framescript.vim b/uvim/runtime/syntax/framescript.mnv
index 8b16d048a0..ddcd577a10 100644
--- a/uvim/runtime/syntax/framescript.vim
+++ b/uvim/runtime/syntax/framescript.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             FrameScript v4.0
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-02-22
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   framescriptOperator
       \ '[+*/%=-]\|[><]=\=\|#[&|]'
diff --git a/uvim/runtime/syntax/freebasic.vim b/uvim/runtime/syntax/freebasic.mnv
index 5c43289c16..a39f4076fe 100644
--- a/uvim/runtime/syntax/freebasic.vim
+++ b/uvim/runtime/syntax/freebasic.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		FreeBASIC
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Mark Manning <markem@sim1.us>
@@ -19,7 +19,7 @@
 "
 "	TODO: split this into separate dialect-based files, possibly with a common base
 "
-"	Quit when a (custom) syntax file was already loaded (Taken from c.vim)
+"	Quit when a (custom) syntax file was already loaded (Taken from c.mnv)
 "
 if exists("b:current_syntax")
   finish
@@ -671,4 +671,4 @@ unlet s:lang
 
 let b:current_syntax = "freebasic"
 
-" vim: ts=8 tw=132 fdm=marker
+" mnv: ts=8 tw=132 fdm=marker
diff --git a/uvim/runtime/syntax/fstab.vim b/uvim/runtime/syntax/fstab.mnv
index a7ec978be3..4a8bfeb132 100644
--- a/uvim/runtime/syntax/fstab.vim
+++ b/uvim/runtime/syntax/fstab.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: fstab file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
-" URL: https://raw.github.com/rid9/vim-fstab/master/syntax/fstab.vim
+" URL: https://raw.github.com/rid9/mnv-fstab/master/syntax/fstab.mnv
 " Last Change: 2026 Feb 14
 " Version: 1.7.1
 "
@@ -29,7 +29,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " General
 syn cluster fsGeneralCluster contains=fsComment
@@ -527,4 +527,4 @@ let b:current_syntax = "fstab"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 noet ft=vim
+" mnv: ts=8 noet ft=mnv
diff --git a/uvim/runtime/syntax/fvwm.vim b/uvim/runtime/syntax/fvwm.mnv
index cb974a2daf..6ff33ec5a1 100644
--- a/uvim/runtime/syntax/fvwm.vim
+++ b/uvim/runtime/syntax/fvwm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file for Fvwm-2.5.22
+" MNV syntax file for Fvwm-2.5.22
 " Language:		Fvwm{1,2} configuration file
 " Maintainer:		Gautam Iyer <gi1242@users.sourceforge.net>
 " Previous Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
     finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Fvwm configuration files are case insensitive
 syn case ignore
diff --git a/uvim/runtime/syntax/fvwm2m4.vim b/uvim/runtime/syntax/fvwm2m4.mnv
index e296273e31..b9a4de396f 100644
--- a/uvim/runtime/syntax/fvwm2m4.vim
+++ b/uvim/runtime/syntax/fvwm2m4.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language: FvwmM4 preprocessed Fvwm2 configuration files
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2002-06-02
-" URI: http://physics.muni.cz/~yeti/download/syntax/fvwmm4.vim
+" URI: http://physics.muni.cz/~yeti/download/syntax/fvwmm4.mnv
 
 " Setup
 " quit when a syntax file was already loaded
@@ -16,11 +16,11 @@ if !exists('main_syntax')
 endif
 
 " Include M4 syntax
-runtime! syntax/m4.vim
+runtime! syntax/m4.mnv
 unlet b:current_syntax
 
 " Include Fvwm2 syntax (Fvwm1 doesn't have M4 preprocessor)
-runtime! syntax/fvwm.vim
+runtime! syntax/fvwm.mnv
 unlet b:current_syntax
 
 " That's all!
diff --git a/uvim/runtime/syntax/gdb.vim b/uvim/runtime/syntax/gdb.mnv
index 0955f0f107..072488e104 100644
--- a/uvim/runtime/syntax/gdb.vim
+++ b/uvim/runtime/syntax/gdb.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		GDB command files
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Claudio Fleiner <claudio@fleiner.com>
@@ -13,13 +13,13 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,_,128-167,224-235,-
 
 " Include {{{1
 " TODO: other languages: ada asm auto c d fortran go local minimal opencl pascal rust unknown
-syn include @gdbC syntax/c.vim
+syn include @gdbC syntax/c.mnv
 unlet b:current_syntax
 
 syn region  gdbExpression contained start="\S" skip="\\$" end="$" contains=@gdbC,gdbLineContinuation transparent
@@ -782,7 +782,7 @@ syn region  gdbMultilineCommand contained start="\<\%(compi\%[le]\|exp\%[ression
 syn keyword gdbCommand contained compl[ete]
 
 " Guile {{{3
-syn include @gdbGuile syntax/scheme.vim
+syn include @gdbGuile syntax/scheme.mnv
 unlet b:current_syntax
 syn keyword gdbCommand contained guile-repl
 syn keyword gdbCommand contained gr
@@ -792,7 +792,7 @@ syn region  gdbMultilineCommand contained matchgroup=gdbCommand start="\<gu\%(il
 syn keyword gdbCommand contained mo[nitor]
 
 " Python {{{3
-syn include @gdbPython syntax/python.vim
+syn include @gdbPython syntax/python.mnv
 unlet b:current_syntax
 syn region  gdbCommand contained matchgroup=gdbCommand start="\<py\%(thon\)\=\ze\s" start="\<\%(python-interactive\|pi\)\ze\s" skip="\\$" end="$" contains=@gdbPython keepend transparent fold
 syn region  gdbMultilineCommand contained matchgroup=gdbCommand start="\<py\%(thon\)\=\ze\s*$" end="^\s*\zsend\ze\s*$" contains=@gdbPython transparent fold
@@ -952,7 +952,7 @@ syn match   gdbCommand contained "|"
 syn keyword gdbCommand contained qui[t] exi[t] q
 syn keyword gdbCommand contained she[ll] nextgroup=gdbShellValue skipwhite
 syn match   gdbCommand contained "!"     nextgroup=gdbShellValue skipwhite
-  syn include @gdbSh syntax/sh.vim
+  syn include @gdbSh syntax/sh.mnv
   unlet b:current_syntax
   syn region gdbShellValue contained start="\S" skip="\\$" end="$" contains=@gdbSh,gdbLineContinuation keepend
 syn keyword gdbCommand contained so[urce] nextgroup=gdbSourceOption skipwhite
@@ -1642,4 +1642,4 @@ let b:current_syntax = "gdb"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/gdmo.vim b/uvim/runtime/syntax/gdmo.mnv
index 009f402ffa..5b55c3f9cd 100644
--- a/uvim/runtime/syntax/gdmo.vim
+++ b/uvim/runtime/syntax/gdmo.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	GDMO
 "		(ISO-10165-4; Guidelines for the Definition of Managed Object)
 " Maintainer:	Gyuman (Chester) Kim <violkim@gmail.com>
-" URL:		http://classicalprogrammer.wikidot.com/local--files/vim-syntax-file-for-gdmo/gdmo.vim
+" URL:		http://classicalprogrammer.wikidot.com/local--files/mnv-syntax-file-for-gdmo/gdmo.mnv
 " Last change:	8th June, 2011
 
 " quit when a syntax file was already loaded
@@ -80,4 +80,4 @@ hi def link gdmoType	      Type
 
 let b:current_syntax = "gdmo"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/gdresource.vim b/uvim/runtime/syntax/gdresource.mnv
index 7e1a2513e2..df84f52abc 100644
--- a/uvim/runtime/syntax/gdresource.vim
+++ b/uvim/runtime/syntax/gdresource.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file for Godot resource (scenes)
+" MNV syntax file for Godot resource (scenes)
 " Language:     gdresource
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Filenames:    *.tscn, *.tres
-" Website:      https://github.com/habamax/vim-gdscript
+" Website:      https://github.com/habamax/mnv-gdscript
 
 if exists("b:current_syntax")
     finish
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match gdResourceNumber "\<0x\%(_\=\x\)\+\>"
 syn match gdResourceNumber "\<0b\%(_\=[01]\)\+\>"
diff --git a/uvim/runtime/syntax/gdscript.vim b/uvim/runtime/syntax/gdscript.mnv
index 48af153513..210b8504d8 100644
--- a/uvim/runtime/syntax/gdscript.vim
+++ b/uvim/runtime/syntax/gdscript.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file for Godot gdscript
+" MNV syntax file for Godot gdscript
 " Language:     gdscript
 " Maintainer:   Maxim Kim <habamax@gmail.com>
-" Website:      https://github.com/habamax/vim-gdscript
+" Website:      https://github.com/habamax/mnv-gdscript
 " Filenames:    *.gd
 
 if exists("b:current_syntax")
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax sync maxlines=100
 
diff --git a/uvim/runtime/syntax/gdshader.vim b/uvim/runtime/syntax/gdshader.mnv
index f0d9f7edd9..c049f193a4 100644
--- a/uvim/runtime/syntax/gdshader.vim
+++ b/uvim/runtime/syntax/gdshader.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file for Godot shading language
+" MNV syntax file for Godot shading language
 " Language:     gdshader
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Filenames:    *.gdshader
diff --git a/uvim/runtime/syntax/gedcom.vim b/uvim/runtime/syntax/gedcom.mnv
index cd09e0fa22..b8ec91434a 100644
--- a/uvim/runtime/syntax/gedcom.vim
+++ b/uvim/runtime/syntax/gedcom.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Gedcom
 " Maintainer:	Paul Johnson (pjcj@transeda.com)
 " Version 1.059 - 23rd December 1999
diff --git a/uvim/runtime/syntax/gel.vim b/uvim/runtime/syntax/gel.mnv
index 5f3800273c..93f17339d7 100644
--- a/uvim/runtime/syntax/gel.vim
+++ b/uvim/runtime/syntax/gel.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TI Code Composer Studio General Extension Language
 " Document:	https://downloads.ti.com/ccs/esd/documents/users_guide/ccs_debug-gel.html
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 
 syn keyword gelStatement	StartUp GEL_AddInputFile GEL_AddOutputFile GEL_AdvancedReset GEL_AsmStepInto GEL_AsmStepOver GEL_BreakPtAdd GEL_BreakPtDel GEL_BreakPtDisable GEL_BreakPtReset GEL_CancelTimer GEL_Connect GEL_Dialog GEL_DisableFileOutput GEL_DisableRealtime GEL_Disconnect GEL_EnableClock GEL_EnableFileOutput GEL_EnableRealtime GEL_EnableZeroFill GEL_EvalOnTarget GEL_GetBoolDebugProperty GEL_GetBoolDriverProperty GEL_GetBoolTargetDbProperty GEL_GetNumericDebugProperty GEL_GetNumericDriverProperty GEL_GetNumericTargetDbProperty GEL_GetStringDebugProperty GEL_GetStringDriverProperty GEL_GetStringTargetDbProperty GEL_Go GEL_Halt GEL_HandleTargetError GEL_HWBreakPtAdd GEL_HWBreakPtDel GEL_HWBreakPtDisable GEL_HWBreakPtReset GEL_IsConnected GEL_IsHalted GEL_IsInRealtimeMode GEL_IsResetSupported GEL_IsTimerSet GEL_Load GEL_LoadBin GEL_LoadGel GEL_LoadProgramOnly GEL_MapAdd GEL_MapAddStr GEL_MapDelete GEL_MapOff GEL_MapOn GEL_MapReset GEL_MatchesConnection GEL_MemoryFill GEL_MemoryListSupportedTypes GEL_MemoryLoad GEL_MemoryLoadData GEL_MemorySave GEL_MemorySaveBin GEL_MemorySaveCoff GEL_MemorySaveData GEL_MemorySaveHex GEL_PatchAssembly GEL_ProbePtAdd GEL_ProbePtDel GEL_ProbePtDisable GEL_ProbePtReset GEL_ReConnect GEL_RefreshWindows GEL_Reload GEL_RemoveDebugState GEL_RemoveInputFile GEL_RemoveOutputFile GEL_Reset GEL_Restart GEL_RestoreDebugState GEL_Run GEL_RunF GEL_SetBlockResetMode GEL_SetBoolDebugProperty GEL_SetClockEvent GEL_SetNumericDebugProperty GEL_SetSemihostingMainArgs GEL_SetStringDebugProperty GEL_SetTimer GEL_SetWaitInResetMode GEL_SrcStepInto GEL_SrcStepOver GEL_StepInto GEL_StepOut GEL_StepOver GEL_StrCat GEL_StrLen GEL_SubStr GEL_SymbolAdd GEL_SymbolAddOffset GEL_SymbolAddRel GEL_SymbolDisable GEL_SymbolEnable GEL_SymbolHideSection GEL_SymbolLoad GEL_SymbolLoadOffset GEL_SymbolLoadRel GEL_SymbolRemove GEL_SymbolShowSection GEL_SyncHalt GEL_SyncRun GEL_SyncStepInto GEL_SyncStepOut GEL_SyncStepOver GEL_System GEL_TargetTextOut GEL_TextOut GEL_Trace GEL_UnloadAllGels GEL_UnloadAllSymbols GEL_UnloadGel GEL_VerifyBinProgram GEL_VerifyProgram OnChildRunning OnFileLoaded OnHalt OnPreFileLoaded OnPreReset OnPreTargetConnect OnReset OnResetDetected OnRestart OnTargetConnect
 syn keyword gelModifier	hotmenu menuitem
diff --git a/uvim/runtime/syntax/gemtext.vim b/uvim/runtime/syntax/gemtext.mnv
index 8c2bd29928..241e139cae 100644
--- a/uvim/runtime/syntax/gemtext.vim
+++ b/uvim/runtime/syntax/gemtext.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Gemtext markup language
 " Maintainer:           Suneel Freimuth <suneelfreimuth1@gmail.com>
 " Latest Revision:      2020-11-21
diff --git a/uvim/runtime/syntax/generator/Makefile b/uvim/runtime/syntax/generator/Makefile
index 2a51e647b4..5107a5445c 100644
--- a/uvim/runtime/syntax/generator/Makefile
+++ b/uvim/runtime/syntax/generator/Makefile
@@ -1,15 +1,15 @@
 #
-# Makefile for generate runtime/syntax/vim.vim
+# Makefile for generate runtime/syntax/mnv.mnv
 #
-VIM_SRCDIR := ../../../src
-RUN_VIMPROG := $(VIM_SRCDIR)/vim -N -u NONE -i NONE -n
-TARGET := ../vim.vim
+MNV_SRCDIR := ../../../src
+RUN_MNVPROG := $(MNV_SRCDIR)/mnv -N -u NONE -i NONE -n
+TARGET := ../mnv.mnv
 CHECK_HELP_DOC := 0
 
-SRC :=	$(VIM_SRCDIR)/eval.c $(VIM_SRCDIR)/ex_cmds.h $(VIM_SRCDIR)/ex_docmd.c \
-		$(VIM_SRCDIR)/fileio.c $(VIM_SRCDIR)/option.c $(VIM_SRCDIR)/syntax.c
+SRC :=	$(MNV_SRCDIR)/eval.c $(MNV_SRCDIR)/ex_cmds.h $(MNV_SRCDIR)/ex_docmd.c \
+		$(MNV_SRCDIR)/fileio.c $(MNV_SRCDIR)/option.c $(MNV_SRCDIR)/syntax.c
 
-export VIM_SRCDIR
+export MNV_SRCDIR
 export CHECK_HELP_DOC
 
 .PHONY: generate check_doc clean
@@ -21,19 +21,19 @@ check_doc: CHECK_HELP_DOC := 1
 check_doc: clean $(TARGET)
 
 clean:
-	rm -f vim.vim.rc $(TARGET)
+	rm -f mnv.mnv.rc $(TARGET)
 	rm -f sanity_check.err generator.err
 
-$(TARGET): vim.vim.rc update_date.vim
+$(TARGET): mnv.mnv.rc update_date.mnv
 	@echo "Generating $(TARGET) ..."
-	@cp -f vim.vim.rc $(TARGET)
-	@$(RUN_VIMPROG) -S update_date.vim $(TARGET)
+	@cp -f mnv.mnv.rc $(TARGET)
+	@$(RUN_MNVPROG) -S update_date.mnv $(TARGET)
 	@echo "done."
 
-vim.vim.rc: gen_syntax_vim.vim vim.vim.base $(SRC)
-	@echo "Generating vim.vim.rc ..."
+mnv.mnv.rc: gen_syntax_mnv.mnv mnv.mnv.base $(SRC)
+	@echo "Generating mnv.mnv.rc ..."
 	@rm -f sanity_check.err generator.err
-	@$(RUN_VIMPROG) -S gen_syntax_vim.vim $(TARGET)
+	@$(RUN_MNVPROG) -S gen_syntax_mnv.mnv $(TARGET)
 	@if test -f sanity_check.err ; then \
 		echo ; \
 		echo "Sanity errors:" ; \
diff --git a/uvim/runtime/syntax/generator/README.md b/uvim/runtime/syntax/generator/README.md
index 6db445ced2..b5de367fa5 100644
--- a/uvim/runtime/syntax/generator/README.md
+++ b/uvim/runtime/syntax/generator/README.md
@@ -1,26 +1,26 @@
-# Generator of Vim script Syntax File
+# Generator of MNV script Syntax File
 
-This directory contains a Vim script generator, that will parse the Vim source file and
-generate a vim.vim syntax file.
+This directory contains a MNV script generator, that will parse the MNV source file and
+generate a mnv.mnv syntax file.
 
-Files in this directory were copied from https://github.com/vim-jp/syntax-vim-ex/
-and included here on Feb, 13th, 2024 for the Vim Project.
+Files in this directory were copied from https://github.com/mnv-jp/syntax-mnv-ex/
+and included here on Feb, 13th, 2024 for the MNV Project.
 
 - Maintainer: Hirohito Higashi
-- License: Vim License
+- License: MNV License
 
 ## How to generate
 
     $ make
 
-This will generate `../vim.vim`
+This will generate `../mnv.mnv`
 
 ## Files
 
 Name                 |Description
 ---------------------|------------------------------------------------------
-`Makefile`           |Makefile to generate ../vim.vim
+`Makefile`           |Makefile to generate ../mnv.mnv
 `README.md`          |This file
-`gen_syntax_vim.vim` |Script to generate vim.vim
-`update_date.vim`    |Script to update "Last Change:"
-`vim.vim.base`       |Template for vim.vim
+`gen_syntax_mnv.mnv` |Script to generate mnv.mnv
+`update_date.mnv`    |Script to update "Last Change:"
+`mnv.mnv.base`       |Template for mnv.mnv
diff --git a/uvim/runtime/syntax/generator/gen_syntax_vim.vim b/uvim/runtime/syntax/generator/gen_syntax_mnv.mnv
index 3e7fe1bc2d..e5288cd3c9 100644
--- a/uvim/runtime/syntax/generator/gen_syntax_vim.vim
+++ b/uvim/runtime/syntax/generator/gen_syntax_mnv.mnv
@@ -1,17 +1,17 @@
-" Vim syntax file generator
-" Language:		 Vim script
+" MNV syntax file generator
+" Language:		 MNV script
 " Maintainer:  Hirohito Higashi (h_east)
 " Last Change: 2025 Dec 04
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 language C
 let s:log_write_dir = getcwd() . '/'
 
-function s:parse_vim_option(opt, missing_opt, term_out_code)
+function s:parse_mnv_option(opt, missing_opt, term_out_code)
 	try
-		let file_name = $VIM_SRCDIR . '/optiondefs.h'
+		let file_name = $MNV_SRCDIR . '/optiondefs.h'
 		let item = {}
 
 		new
@@ -69,7 +69,7 @@ function s:parse_vim_option(opt, missing_opt, term_out_code)
 	endtry
 endfunc
 
-function s:append_syn_vimopt(lnum, str_info, opt_list, prefix, bool_only)
+function s:append_syn_mnvopt(lnum, str_info, opt_list, prefix, bool_only)
 	let ret_lnum = a:lnum
 	let str = a:str_info.start
 
@@ -100,9 +100,9 @@ function s:append_syn_vimopt(lnum, str_info, opt_list, prefix, bool_only)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_command(cmd)
+function s:parse_mnv_command(cmd)
 	try
-		let file_name = $VIM_SRCDIR . '/ex_cmds.h'
+		let file_name = $MNV_SRCDIR . '/ex_cmds.h'
 		let item = {}
 
 		new
@@ -160,7 +160,7 @@ function s:parse_vim_command(cmd)
 				endif
 
 				let item.name = lcmd[key][my]
-				let item.type = s:get_vim_command_type(item.name)
+				let item.type = s:get_mnv_command_type(item.name)
 				if omit_idx + 1 < strlen(item.name)
 					let item.omit_idx = omit_idx
 					let item.syn_str = item.name[:omit_idx] . '[' . 
@@ -177,7 +177,7 @@ function s:parse_vim_command(cmd)
 		for i in ['l', 'p']
 			let str = 'delete'
 			let item.name = str . i
-			let item.type = s:get_vim_command_type(item.name)
+			let item.type = s:get_mnv_command_type(item.name)
 			let item.omit_idx = -1
 			for x in range(strlen(str))
 				let item.syn_str = str[:x] . i
@@ -197,7 +197,7 @@ function s:parse_vim_command(cmd)
 		let item.syn_str = item.name
 		call add(a:cmd, copy(item))
 
-		let no_shorten_in_vim9 =<< trim EOL
+		let no_shorten_in_mnv9 =<< trim EOL
 			final
 			def
 			enddef
@@ -216,10 +216,10 @@ function s:parse_vim_command(cmd)
 		EOL
 
 		call map(a:cmd, {_, v ->
-			\ index(no_shorten_in_vim9, v.name) != -1 ?
+			\ index(no_shorten_in_mnv9, v.name) != -1 ?
 			\		extend(copy(v), {'omit_idx': -1, 'syn_str': v.name}) :
 			"\ ":fina" means ":finally" in legacy script, for backwards compatibility.
-			"\ (From Vim source code find_ex_command() in ex_docmd.c)
+			"\ (From MNV source code find_ex_command() in ex_docmd.c)
 			\ v.name ==# 'finally' ?
 			\		extend(copy(v), {'omit_idx': 3, 'syn_str': 'fina[lly]'}) :
 			"\ :ho must not be recognized as :horizontal.
@@ -242,7 +242,7 @@ function s:memoize_cmd_modifiers()
 	function _() closure
 		if empty(modifiers)
 			try
-				let file_name = $VIM_SRCDIR .. '/ex_docmd.c'
+				let file_name = $MNV_SRCDIR .. '/ex_docmd.c'
 
 				new
 				exec 'read ' .. file_name
@@ -280,7 +280,7 @@ function s:memoize_cmd_modifiers()
 endfunction
 let s:get_cmd_modifiers = s:memoize_cmd_modifiers()
 
-function s:get_vim_command_type(cmd_name)
+function s:get_mnv_command_type(cmd_name)
 	" Return value:
 	"   0: normal
 	"   1: (Reserved)
@@ -379,8 +379,8 @@ function s:get_vim_command_type(cmd_name)
 		lhelpgrep
 		lgrep
 		lgrepadd
-		lvimgrep
-		lvimgrepadd
+		lmnvgrep
+		lmnvgrepadd
 		make
 		lua
 		luado
@@ -445,9 +445,9 @@ function s:get_vim_command_type(cmd_name)
 		unlockvar
 		unmap
 		var
-		vim9script
-		vimgrep
-		vimgrepadd
+		mnv9script
+		mnvgrep
+		mnvgrepadd
 		while
 		wincmd
 		windo
@@ -479,7 +479,7 @@ function s:get_vim_command_type(cmd_name)
 	return ret
 endfunc
 
-function s:append_syn_vimcmd(lnum, str_info, cmd_list, type)
+function s:append_syn_mnvcmd(lnum, str_info, cmd_list, type)
 	let ret_lnum = a:lnum
 	let str = a:str_info.start
 
@@ -507,9 +507,9 @@ function s:append_syn_vimcmd(lnum, str_info, cmd_list, type)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_event(li)
+function s:parse_mnv_event(li)
 	try
-		let file_name = $VIM_SRCDIR . '/autocmd.c'
+		let file_name = $MNV_SRCDIR . '/autocmd.c'
 		let item = {}
 
 		new
@@ -528,7 +528,7 @@ function s:parse_vim_event(li)
 		endfor
 
 		" "User" requires a user defined argument event.
-		" (Separately specified in vim.vim.base).
+		" (Separately specified in mnv.mnv.base).
 		call filter(a:li, {idx, val -> val.name !=# 'User'})
 
 		quit!
@@ -543,9 +543,9 @@ function s:parse_vim_event(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_function(li)
+function s:parse_mnv_function(li)
 	try
-		let file_name = $VIM_SRCDIR . '/evalfunc.c'
+		let file_name = $MNV_SRCDIR . '/evalfunc.c'
 		let item = {}
 
 		new
@@ -578,9 +578,9 @@ function s:parse_vim_function(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_group(li)
+function s:parse_mnv_group(li)
 	try
-		let file_name = $VIM_SRCDIR . '/../runtime/syntax/syncolor.vim'
+		let file_name = $MNV_SRCDIR . '/../runtime/syntax/syncolor.mnv'
 		let item = {}
 
 		new
@@ -605,9 +605,9 @@ function s:parse_vim_group(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_hlgroup(li)
+function s:parse_mnv_hlgroup(li)
 	try
-		let file_name = $VIM_SRCDIR . '/highlight.c'
+		let file_name = $MNV_SRCDIR . '/highlight.c'
 		let item = {}
 
 		new
@@ -668,7 +668,7 @@ function s:parse_vim_hlgroup(li)
 		endfor
 
 		" "Conceal" is a :syn option and cannot be used as keyword, so remove it.
-		" (Separately specified as 'syn match' in vim.vim.base).
+		" (Separately specified as 'syn match' in mnv.mnv.base).
 		call filter(a:li, {idx, val -> val.name !=# 'Conceal'})
 
 		quit!
@@ -683,9 +683,9 @@ function s:parse_vim_hlgroup(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_complete_name(li)
+function s:parse_mnv_complete_name(li)
 	try
-		let file_name = $VIM_SRCDIR . '/usercmd.c'
+		let file_name = $MNV_SRCDIR . '/usercmd.c'
 		let item = {}
 
 		new
@@ -716,9 +716,9 @@ function s:parse_vim_complete_name(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_addr_name(li)
+function s:parse_mnv_addr_name(li)
 	try
-		let file_name = $VIM_SRCDIR . '/usercmd.c'
+		let file_name = $MNV_SRCDIR . '/usercmd.c'
 		let item = {}
 
 		new
@@ -739,7 +739,7 @@ function s:parse_vim_addr_name(li)
 		endfor
 
 		" '?' is not in 'iskeyword' and cannot be used as keyword, so remove it.
-		" (Separately specified as 'syn match' in vim.vim.base).
+		" (Separately specified as 'syn match' in mnv.mnv.base).
 		call filter(a:li, {idx, val -> val.name !=# '?'})
 
 		quit!
@@ -754,15 +754,15 @@ function s:parse_vim_addr_name(li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:parse_vim_var(li)
+function s:parse_mnv_var(li)
 	try
-		let file_name = $VIM_SRCDIR . '/evalvars.c'
+		let file_name = $MNV_SRCDIR . '/evalvars.c'
 		let item = {}
 
 		new
 		exec 'read ' . file_name
 		norm! gg
-		exec '/^} vimvars\[VV_LEN] =\n{$/+1;/^};$/-1yank'
+		exec '/^} mnvvars\[VV_LEN] =\n{$/+1;/^};$/-1yank'
 		%delete _
 
 		put
@@ -812,13 +812,13 @@ function s:append_syn_any(lnum, str_info, li)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:update_syntax_vim_file(vim_info)
+function s:update_syntax_mnv_file(mnv_info)
 	try
 		function! s:search_and_check(kword, base_fname, str_info)
 			let a:str_info.start = ''
 			let a:str_info.end = ''
 
-			let pattern = '^" GEN_SYN_VIM: ' . a:kword . '\s*,'
+			let pattern = '^" GEN_SYN_MNV: ' . a:kword . '\s*,'
 			let lnum = search(pattern)
 			if lnum == 0
 				throw 'Search pattern ''' . pattern . ''' not found in ' .
@@ -833,8 +833,8 @@ function s:update_syntax_vim_file(vim_info)
 			return lnum
 		endfunc
 
-		let target_fname = 'vim.vim.rc'
-		let base_fname = 'vim.vim.base'
+		let target_fname = 'mnv.mnv.rc'
+		let base_fname = 'mnv.mnv.base'
 		let str_info = {}
 		let str_info.start = ''
 		let str_info.end = ''
@@ -846,103 +846,103 @@ function s:update_syntax_vim_file(vim_info)
 		1delete _
 		call cursor(1, 1)
 
-		" vimCommand
-		let li = a:vim_info.cmd
-		" vimCommand - normal
-		let lnum = s:search_and_check('vimCommand normal', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 0)
+		" mnvCommand
+		let li = a:mnv_info.cmd
+		" mnvCommand - normal
+		let lnum = s:search_and_check('mnvCommand normal', base_fname, str_info)
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 0)
 
-		" vimOption
-		let kword = 'vimOption'
-		let li = a:vim_info.opt
-		" vimOption - normal
+		" mnvOption
+		let kword = 'mnvOption'
+		let li = a:mnv_info.opt
+		" mnvOption - normal
 		let lnum = s:search_and_check(kword . ' normal', base_fname, str_info)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, '', 0)
-		" vimOption - turn-off
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, '', 0)
+		" mnvOption - turn-off
 		let lnum = s:search_and_check(kword . ' turn-off', base_fname, str_info)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, 'no', 1)
-		" vimOption - invertible
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, 'no', 1)
+		" mnvOption - invertible
 		let lnum = s:search_and_check(kword . ' invertible', base_fname, str_info)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, 'inv', 1)
-		" vimOption - term output code
-		let li = a:vim_info.term_out_code
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, 'inv', 1)
+		" mnvOption - term output code
+		let li = a:mnv_info.term_out_code
 		let lnum = s:search_and_check(kword . ' term output code', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimOption - normal variable
-		let li = a:vim_info.opt
+		" mnvOption - normal variable
+		let li = a:mnv_info.opt
 		let lnum = s:search_and_check(kword . ' normal variable', base_fname, str_info)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, '', 0)
-		" vimOption - term output code variable
-		let li = a:vim_info.term_out_code
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, '', 0)
+		" mnvOption - term output code variable
+		let li = a:mnv_info.term_out_code
 		let lnum = s:search_and_check(kword . ' term output code variable', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" Missing vimOption
-		let li = a:vim_info.missing_opt
-		let lnum = s:search_and_check('Missing vimOption', base_fname, str_info)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, '', 0)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, 'no', 1)
-		let lnum = s:append_syn_vimopt(lnum, str_info, li, 'inv', 1)
+		" Missing mnvOption
+		let li = a:mnv_info.missing_opt
+		let lnum = s:search_and_check('Missing mnvOption', base_fname, str_info)
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, '', 0)
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, 'no', 1)
+		let lnum = s:append_syn_mnvopt(lnum, str_info, li, 'inv', 1)
 
-		" vimAutoEvent
-		let li = a:vim_info.event
-		let lnum = s:search_and_check('vimAutoEvent', base_fname, str_info)
+		" mnvAutoEvent
+		let li = a:mnv_info.event
+		let lnum = s:search_and_check('mnvAutoEvent', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimGroup
-		let li = a:vim_info.group
-		let lnum = s:search_and_check('vimGroup', base_fname, str_info)
+		" mnvGroup
+		let li = a:mnv_info.group
+		let lnum = s:search_and_check('mnvGroup', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimHLGroup
-		let li = a:vim_info.hlgroup
-		let lnum = s:search_and_check('vimHLGroup', base_fname, str_info)
+		" mnvHLGroup
+		let li = a:mnv_info.hlgroup
+		let lnum = s:search_and_check('mnvHLGroup', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimFuncName
-		let li = a:vim_info.func
-		let lnum = s:search_and_check('vimFuncName', base_fname, str_info)
+		" mnvFuncName
+		let li = a:mnv_info.func
+		let lnum = s:search_and_check('mnvFuncName', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimVarName
-		let li = a:vim_info.var
-		let lnum = s:search_and_check('vimVarName', base_fname, str_info)
+		" mnvVarName
+		let li = a:mnv_info.var
+		let lnum = s:search_and_check('mnvVarName', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimUserAttrComplete
-		let li = a:vim_info.compl_name
-		let lnum = s:search_and_check('vimUserCmdAttrComplete', base_fname, str_info)
+		" mnvUserAttrComplete
+		let li = a:mnv_info.compl_name
+		let lnum = s:search_and_check('mnvUserCmdAttrComplete', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimUserAttrbAddr
-		let li = a:vim_info.addr_name
-		let lnum = s:search_and_check('vimUserCmdAttrAddr', base_fname, str_info)
+		" mnvUserAttrbAddr
+		let li = a:mnv_info.addr_name
+		let lnum = s:search_and_check('mnvUserCmdAttrAddr', base_fname, str_info)
 		let lnum = s:append_syn_any(lnum, str_info, li)
 
-		" vimCommand - abbrev
-		let kword = 'vimCommand'
-		let li = a:vim_info.cmd
+		" mnvCommand - abbrev
+		let kword = 'mnvCommand'
+		let li = a:mnv_info.cmd
 		let lnum = s:search_and_check(kword . ' abbrev', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 2)
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 2)
 		let lnum = s:search_and_check(kword . ' abclear', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 7)
-		" vimCommand - map
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 7)
+		" mnvCommand - map
 		let lnum = s:search_and_check(kword . ' map', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 4)
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 4)
 		let lnum = s:search_and_check(kword . ' mapclear', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 5)
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 5)
 		let lnum = s:search_and_check(kword . ' unmap', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 6)
-		" vimCommand - menu
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 6)
+		" mnvCommand - menu
 		let lnum = s:search_and_check(kword . ' menu', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 3)
-		" vimCommand - modifier
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 3)
+		" mnvCommand - modifier
 		let lnum = s:search_and_check(kword . ' modifier', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 8)
-		" vimCommand - cd
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 8)
+		" mnvCommand - cd
 		let lnum = s:search_and_check(kword . ' cd', base_fname, str_info)
-		let lnum = s:append_syn_vimcmd(lnum, str_info, li, 9)
+		let lnum = s:append_syn_mnvcmd(lnum, str_info, li, 9)
 
 		update
 		quit!
@@ -954,7 +954,7 @@ function s:update_syntax_vim_file(vim_info)
 endfunc
 
 " ------------------------------------------------------------------------------
-function s:check_help_doc(vim_info)
+function s:check_help_doc(mnv_info)
 	try
 		new
 		let cwd_save = getcwd()
@@ -992,21 +992,21 @@ function s:check_help_doc(vim_info)
 
 		" Check the Ex-command is listed in index.txt
 		split index.txt
-		for vimcmd in a:vim_info.cmd
-			if index(exclude_cmd, vimcmd.name) != -1
+		for mnvcmd in a:mnv_info.cmd
+			if index(exclude_cmd, mnvcmd.name) != -1
 				continue
 			endif
 			norm! gg
-			let find_ptn = '^|:' . vimcmd.name . '|\s\+'
+			let find_ptn = '^|:' . mnvcmd.name . '|\s\+'
 			let lnum = search(find_ptn, 'eW')
 			if lnum == 0
-				call s:err_sanity($'Ex-cmd ":{vimcmd.name}" is not found in index.txt.')
+				call s:err_sanity($'Ex-cmd ":{mnvcmd.name}" is not found in index.txt.')
 			elseif search(find_ptn, 'eW') > 0
-				call s:err_sanity($'Ex-cmd ":{vimcmd.name}" is duplicated in index.txt.')
+				call s:err_sanity($'Ex-cmd ":{mnvcmd.name}" is duplicated in index.txt.')
 			else
 				let doc_syn_str = substitute(getline(lnum), find_ptn . ':\(\S\+\)\s\+.*', '\1', '')
-				if doc_syn_str !=# vimcmd.syn_str
-					call s:err_sanity($'Ex-cmd "{vimcmd.name}" short name differ in index.txt. expect: "{vimcmd.syn_str}", but: "{doc_syn_str}"')
+				if doc_syn_str !=# mnvcmd.syn_str
+					call s:err_sanity($'Ex-cmd "{mnvcmd.name}" short name differ in index.txt. expect: "{mnvcmd.syn_str}", but: "{doc_syn_str}"')
 				endif
 			endif
 		endfor
@@ -1014,37 +1014,37 @@ function s:check_help_doc(vim_info)
 
 		" Check the existence of the help tag for Ex-command.
 		set wildignore=version*.txt,todo.txt,usr_*.txt
-		for vimcmd in a:vim_info.cmd
-			if index(exclude_cmd, vimcmd.name) != -1
+		for mnvcmd in a:mnv_info.cmd
+			if index(exclude_cmd, mnvcmd.name) != -1
 				continue
 			endif
-			let find_ptn = '\s\*:' . vimcmd.name . '\*\_s'
-			exec "silent! vimgrep /" . find_ptn . "/gj *.txt"
+			let find_ptn = '\s\*:' . mnvcmd.name . '\*\_s'
+			exec "silent! mnvgrep /" . find_ptn . "/gj *.txt"
 			let qfl = getqflist()
 			if empty(qfl)
-				call s:err_sanity($'Help tag for Ex-cmd ":{vimcmd.name}" not found.')
+				call s:err_sanity($'Help tag for Ex-cmd ":{mnvcmd.name}" not found.')
 			elseif len(qfl) > 1
-				call s:err_sanity($'Help tag for Ex-cmd ":{vimcmd.name}" is duplicated.')
-			elseif index(nocheck_shorten_excmd_list, vimcmd.name) ==# -1
+				call s:err_sanity($'Help tag for Ex-cmd ":{mnvcmd.name}" is duplicated.')
+			elseif index(nocheck_shorten_excmd_list, mnvcmd.name) ==# -1
 				" Check the existence of the shorten Ex-command notation.
 				cc
 				norm! 2k
 				let end_lnum = qfl[0].lnum + 10
-				let find_ptn = '^:.*\<' . vimcmd.syn_str->escape('[]')
+				let find_ptn = '^:.*\<' . mnvcmd.syn_str->escape('[]')
 				let lnum = search(find_ptn, 'W', end_lnum)
 				if lnum == 0
-					if vimcmd.omit_idx != -1
+					if mnvcmd.omit_idx != -1
 						" Check the existence of the shorten help tag for Ex-command.
 						cc
 						norm! k
 						let end_lnum = qfl[0].lnum + 10
-						let find_ptn = '\s\*:' . vimcmd.name[:vimcmd.omit_idx] . '\*\_s'
+						let find_ptn = '\s\*:' . mnvcmd.name[:mnvcmd.omit_idx] . '\*\_s'
 						let lnum = search(find_ptn, 'W', end_lnum)
 					else
 						let lnum = 1
 					endif
 					if lnum == 0
-						call s:err_sanity($'Shorten help tag "{vimcmd.name[:vimcmd.omit_idx]}" for Ex-cmd "{vimcmd.name}" not found.')
+						call s:err_sanity($'Shorten help tag "{mnvcmd.name[:mnvcmd.omit_idx]}" for Ex-cmd "{mnvcmd.name}" not found.')
 					endif
 				endif
 			endif
@@ -1093,36 +1093,36 @@ endfunc
 " ------------------------------------------------------------------------------
 try
 	let s:line_break_len = 768
-	let s:vim_info = {}
-	let s:vim_info.opt = []
-	let s:vim_info.missing_opt = []
-	let s:vim_info.term_out_code = []
-	let s:vim_info.cmd = []
-	let s:vim_info.event = []
-	let s:vim_info.func = []
-	let s:vim_info.group = []
-	let s:vim_info.hlgroup = []
-	let s:vim_info.compl_name = []
-	let s:vim_info.addr_name = []
-	let s:vim_info.var = []
+	let s:mnv_info = {}
+	let s:mnv_info.opt = []
+	let s:mnv_info.missing_opt = []
+	let s:mnv_info.term_out_code = []
+	let s:mnv_info.cmd = []
+	let s:mnv_info.event = []
+	let s:mnv_info.func = []
+	let s:mnv_info.group = []
+	let s:mnv_info.hlgroup = []
+	let s:mnv_info.compl_name = []
+	let s:mnv_info.addr_name = []
+	let s:mnv_info.var = []
 
 	set lazyredraw
 	if !$CHECK_HELP_DOC
-		silent call s:parse_vim_option(s:vim_info.opt, s:vim_info.missing_opt,
-		\						s:vim_info.term_out_code)
-		silent call s:parse_vim_command(s:vim_info.cmd)
-		silent call s:parse_vim_event(s:vim_info.event)
-		silent call s:parse_vim_function(s:vim_info.func)
-		silent call s:parse_vim_group(s:vim_info.group)
-		silent call s:parse_vim_hlgroup(s:vim_info.hlgroup)
-		silent call s:parse_vim_complete_name(s:vim_info.compl_name)
-		silent call s:parse_vim_addr_name(s:vim_info.addr_name)
-		silent call s:parse_vim_var(s:vim_info.var)
-
-		call s:update_syntax_vim_file(s:vim_info)
+		silent call s:parse_mnv_option(s:mnv_info.opt, s:mnv_info.missing_opt,
+		\						s:mnv_info.term_out_code)
+		silent call s:parse_mnv_command(s:mnv_info.cmd)
+		silent call s:parse_mnv_event(s:mnv_info.event)
+		silent call s:parse_mnv_function(s:mnv_info.func)
+		silent call s:parse_mnv_group(s:mnv_info.group)
+		silent call s:parse_mnv_hlgroup(s:mnv_info.hlgroup)
+		silent call s:parse_mnv_complete_name(s:mnv_info.compl_name)
+		silent call s:parse_mnv_addr_name(s:mnv_info.addr_name)
+		silent call s:parse_mnv_var(s:mnv_info.var)
+
+		call s:update_syntax_mnv_file(s:mnv_info)
 	else
-		silent call s:parse_vim_command(s:vim_info.cmd)
-		silent call s:check_help_doc(s:vim_info)
+		silent call s:parse_mnv_command(s:mnv_info.cmd)
+		silent call s:check_help_doc(s:mnv_info)
 	endif
 	set nolazyredraw
 
@@ -1133,4 +1133,4 @@ endtry
 " ---------------------------------------------------------------------
 let &cpo = s:keepcpo
 unlet s:keepcpo
-" vim:ts=2 sw=2
+" mnv:ts=2 sw=2
diff --git a/uvim/runtime/syntax/generator/mnv.mnv.base b/uvim/runtime/syntax/generator/mnv.mnv.base
new file mode 100644
index 0000000000..5f35401ff2
--- /dev/null
+++ b/uvim/runtime/syntax/generator/mnv.mnv.base
@@ -0,0 +1,2868 @@
+" MNV syntax file
+" Language:	   MNV script
+" Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
+"	   Doug Kearns <dougkearns@gmail.com>
+" Last Change:	   2026 Feb 20
+" Former Maintainer: Charles E. Campbell
+
+" DO NOT CHANGE DIRECTLY.
+" THIS FILE PARTLY GENERATED BY gen_syntax_mnv.mnv.
+" (Search string "GEN_SYN_MNV:" in this file)
+
+" Quit when a syntax file was already loaded {{{1
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&mnv
+
+" Feature testing {{{1
+
+" NOTE: mnvsyn_force_mnv9 for internal use only
+let s:mnv9script = get(b:, "mnvsyn_force_mnv9", v:false) || "\n" .. getline(1, 32)->join("\n") =~# '\n\s*mnv9\%[script]\>'
+
+function s:has(feature)
+  return has(a:feature) || index(get(g:, "mnvsyn_mnv_features", []), a:feature) != -1
+endfunction
+
+" Automatically generated keyword lists: {{{1
+
+" mnvTodo: contains common special-notices for comments {{{2
+" Use the mnvCommentGroup cluster to add your own.
+syn keyword mnvTodo contained	COMBAK	FIXME	TODO	XXX
+syn cluster mnvCommentGroup	contains=mnvTodo,@Spell
+
+" regular mnv commands {{{2
+" GEN_SYN_MNV: mnvCommand normal, START_STR='syn keyword mnvCommand contained', END_STR='nextgroup=mnvBang'
+
+" Lower priority :syn-match to allow for :command/function() distinction
+" :chdir is handled specially elsewhere
+syn match mnvCommand "\<co\%[py]\>"     nextgroup=mnvBang
+syn match mnvCommand "\<d\%[elete]\>"   nextgroup=mnvBang
+syn match mnvCommand "\<j\%[oin]\>"     nextgroup=mnvBang
+syn match mnvCommand "\<sp\%[lit]\>"    nextgroup=mnvBang
+syn match mnvCommand "\<sw\%[apname]\>" nextgroup=mnvBang
+
+" GEN_SYN_MNV: mnvCommand modifier, START_STR='syn keyword mnvCommandModifier', END_STR='skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList'
+" :filter is handled specially elsewhere
+syn match	mnvCommandModifierBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvCmdList
+
+" Lower priority :syn-match to allow for :command/function() distinction
+syn match mnvCommand "\<bro\%[wse]\>"  skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList
+syn match mnvCommand "\<conf\%[irm]\>" skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList
+
+" Lower priority for _new_ to distinguish constructors from the command.
+syn match   mnvCommand contained	"\<new\>(\@!"
+syn match   mnvCommand contained	"\<z[-+^.=]\=\>"
+syn keyword mnvStdPlugin contained	Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man Over Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Until Winbar XMLent XMLns
+
+" mnvOptions are caught only when contained in a mnvSet {{{2
+" GEN_SYN_MNV: mnvOption normal, START_STR='syn keyword mnvOption contained', END_STR='skipwhite nextgroup=mnvSetEqual,mnvSetMod'
+
+" mnvOptions: These are the turn-off setting variants {{{2
+" GEN_SYN_MNV: mnvOption turn-off, START_STR='syn keyword mnvOption contained', END_STR=''
+
+" mnvOptions: These are the invertible variants {{{2
+" GEN_SYN_MNV: mnvOption invertible, START_STR='syn keyword mnvOption contained', END_STR=''
+" termcap codes (which can also be set) {{{2
+" GEN_SYN_MNV: mnvOption term output code, START_STR='syn keyword mnvOption contained', END_STR='skipwhite nextgroup=mnvSetEqual,mnvSetMod'
+" term key codes
+syn keyword mnvOption contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
+syn match   mnvOption contained	"t_%1"
+syn match   mnvOption contained	"t_#2"
+syn match   mnvOption contained	"t_#4"
+syn match   mnvOption contained	"t_@7"
+syn match   mnvOption contained	"t_*7"
+syn match   mnvOption contained	"t_&8"
+syn match   mnvOption contained	"t_%i"
+syn match   mnvOption contained	"t_k;"
+
+" mnvOptions: These are the variable names {{{2
+" GEN_SYN_MNV: mnvOption normal variable,           START_STR='syn keyword mnvOptionVarName contained', END_STR=''
+" GEN_SYN_MNV: mnvOption term output code variable, START_STR='syn keyword mnvOptionVarName contained', END_STR=''
+syn keyword mnvOptionVarName contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
+syn match   mnvOptionVarName contained	"t_%1"
+syn match   mnvOptionVarName contained	"t_#2"
+syn match   mnvOptionVarName contained	"t_#4"
+syn match   mnvOptionVarName contained	"t_@7"
+syn match   mnvOptionVarName contained	"t_*7"
+syn match   mnvOptionVarName contained	"t_&8"
+syn match   mnvOptionVarName contained	"t_%i"
+syn match   mnvOptionVarName contained	"t_k;"
+
+" unsupported settings: some were supported by vi but don't do anything in mnv {{{2
+" GEN_SYN_MNV: Missing mnvOption, START_STR='syn keyword mnvErrSetting contained', END_STR=''
+
+" AutoCmd Events {{{2
+syn case ignore
+" GEN_SYN_MNV: mnvAutoEvent, START_STR='syn keyword mnvAutoEvent contained', END_STR='skipwhite nextgroup=mnvAutoEventSep,@mnvAutocmdPattern'
+
+syn keyword	mnvAutoEvent	contained	User	skipwhite nextgroup=mnvUserAutoEvent
+syn match	mnvUserAutoEvent	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvUserAutoEventSep,mnvAutocmdMod,mnvAutocmdBlock
+
+" Highlight commonly used Groupnames {{{2
+" GEN_SYN_MNV: mnvGroup, START_STR='syn keyword mnvGroup contained', END_STR=''
+
+" Default highlighting groups {{{2
+" GEN_SYN_MNV: mnvHLGroup, START_STR='syn keyword mnvHLGroup contained', END_STR=''
+syn match mnvHLGroup contained "\<Conceal\>"
+syn case match
+
+" Function Names {{{2
+" GEN_SYN_MNV: mnvFuncName, START_STR='syn keyword mnvFuncName contained', END_STR=''
+
+" Predefined variable names {{{2
+" GEN_SYN_MNV: mnvVarName, START_STR='syn keyword mnvMNVVarName contained', END_STR=''
+
+"--- syntax here and above generated by runtime/syntax/generator/gen_syntax_mnv.mnv ---
+
+" Special MNV Highlighting (not automatic) {{{1
+
+" Neomnv keyword list additions {{{2
+
+if s:has("nmnv")
+  syn keyword mnvOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
+  syn keyword mnvFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
+  syn match   mnvFuncName      contained "\<nmnv_\w\+\>"
+  syn keyword mnvMNVVarName    contained lua msgpack_types relnum stderr termrequest virtnum
+endif
+
+" Set up commands for this syntax highlighting file {{{2
+
+com! -nargs=* MNV9 execute <q-args> s:mnv9script ? "" : "contained"
+com! -nargs=* MNVL execute <q-args> s:mnv9script ? "contained" : ""
+
+if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# '[acefhiHlmpPrt]'
+ if g:mnvsyn_folding =~# 'a'
+  com! -nargs=* MNVFolda <args> fold
+ else
+  com! -nargs=* MNVFolda <args>
+ endif
+ if g:mnvsyn_folding =~# 'c'
+  com! -nargs=* MNVFoldc <args> fold
+ else
+  com! -nargs=* MNVFoldc <args>
+ endif
+ if g:mnvsyn_folding =~# 'e'
+  com! -nargs=* MNVFolde <args> fold
+ else
+  com! -nargs=* MNVFolde <args>
+ endif
+ if g:mnvsyn_folding =~# 'f'
+  com! -nargs=* MNVFoldf <args> fold
+ else
+  com! -nargs=* MNVFoldf <args>
+ endif
+ if g:mnvsyn_folding =~# 'h'
+  com! -nargs=* MNVFoldh <args> fold
+ else
+  com! -nargs=* MNVFoldh <args>
+ endif
+ if g:mnvsyn_folding =~# 'H'
+  com! -nargs=* MNVFoldH <args> fold
+ else
+  com! -nargs=* MNVFoldH <args>
+ endif
+ if g:mnvsyn_folding =~# 'i'
+  com! -nargs=* MNVFoldi <args> fold
+ else
+  com! -nargs=* MNVFoldi <args>
+ endif
+ if g:mnvsyn_folding =~# 'l'
+  com! -nargs=* MNVFoldl <args> fold
+ else
+  com! -nargs=* MNVFoldl <args>
+ endif
+ if g:mnvsyn_folding =~# 'm'
+  com! -nargs=* MNVFoldm <args> fold
+ else
+  com! -nargs=* MNVFoldm <args>
+ endif
+ if g:mnvsyn_folding =~# 'p'
+  com! -nargs=* MNVFoldp <args> fold
+ else
+  com! -nargs=* MNVFoldp <args>
+ endif
+ if g:mnvsyn_folding =~# 'P'
+  com! -nargs=* MNVFoldP <args> fold
+ else
+  com! -nargs=* MNVFoldP <args>
+ endif
+ if g:mnvsyn_folding =~# 'r'
+  com! -nargs=* MNVFoldr <args> fold
+ else
+  com! -nargs=* MNVFoldr <args>
+ endif
+ if g:mnvsyn_folding =~# 't'
+  com! -nargs=* MNVFoldt <args> fold
+ else
+  com! -nargs=* MNVFoldt <args>
+ endif
+else
+ com! -nargs=*	MNVFolda	<args>
+ com! -nargs=*	MNVFoldc	<args>
+ com! -nargs=*	MNVFolde	<args>
+ com! -nargs=*	MNVFoldf	<args>
+ com! -nargs=*	MNVFoldi	<args>
+ com! -nargs=*	MNVFoldh	<args>
+ com! -nargs=*	MNVFoldH	<args>
+ com! -nargs=*	MNVFoldl	<args>
+ com! -nargs=*	MNVFoldm	<args>
+ com! -nargs=*	MNVFoldp	<args>
+ com! -nargs=*	MNVFoldP	<args>
+ com! -nargs=*	MNVFoldr	<args>
+ com! -nargs=*	MNVFoldt	<args>
+endif
+
+" Deprecated variable options {{{2
+if exists("g:mnv_minlines")
+ let g:mnvsyn_minlines= g:mnv_minlines
+endif
+if exists("g:mnv_maxlines")
+ let g:mnvsyn_maxlines= g:mnv_maxlines
+endif
+if exists("g:mnvsyntax_noerror")
+ let g:mnvsyn_noerror= g:mnvsyntax_noerror
+endif
+
+" Nulls {{{2
+" =====
+MNV9 syn keyword  mnv9Null	null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string null_tuple
+
+" Booleans {{{2
+" ========
+MNV9 syn keyword mnv9Boolean	true false
+
+" Numbers {{{2
+" =======
+syn case ignore
+syn match	mnvNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript,mnvGlobal,mnvSubst1
+syn match	mnvNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@mnvComment
+syn match	mnvNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	'\<0z\>'			skipwhite nextgroup=@mnvComment
+syn match	mnvNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@mnvComment,mnvSubscript
+syn case match
+
+" All mnvCommands are contained by mnvIsCommand. {{{2
+syn cluster mnvCmdList	contains=mnvAbb,mnvAddress,mnvAt,mnvAutocmd,mnvAugroup,mnvBehave,mnvBreakadd,mnvBreakdel,mnvBreaklist,mnvCall,mnvCatch,mnvCd,mnvCommandModifier,mnvConst,mnvDoautocmd,mnvDebug,mnvDebuggreedy,mnvDef,mnvDefFold,mnvDefer,mnvDelcommand,mnvDelFunction,mnvDoCommand,@mnvEcho,mnvElse,mnvEnddef,mnvEndfunction,mnvEndif,mnvEval,mnvExecute,mnvIsCommand,mnvExtCmd,mnvExFilter,mnvExMark,mnvFiletype,mnvFor,mnvFunction,mnvFunctionFold,mnvGrep,mnvGrepAdd,mnvGlobal,mnvHelp,mnvHelpgrep,mnvHighlight,mnvHistory,mnvImport,mnvLanguage,mnvLet,mnvLoadkeymap,mnvLockvar,mnvMake,mnvMap,mnvMark,mnvMatch,mnvNotFunc,mnvNormal,mnvProfdel,mnvProfile,mnvPrompt,mnvRedir,mnvSet,mnvSleep,mnvSort,mnvSyntax,mnvSyntime,mnvSynColor,mnvSynLink,mnvTerminal,mnvThrow,mnvUniq,mnvUnlet,mnvUnlockvar,mnvUnmap,mnvUserCmd,mnvMNVgrep,mnvMNVgrepadd,mnvWincmd,mnvMenu,mnvMenutranslate,@mnv9CmdList,@mnvExUserCmdList,mnvLua,mnvMzScheme,mnvPerl,mnvPython,mnvPython3,mnvPythonX,mnvRuby,mnvTcl
+syn cluster mnv9CmdList	contains=mnv9Abstract,mnv9Class,mnv9Const,mnv9Enum,mnv9Export,mnv9Final,mnv9For,mnv9Interface,mnv9Type,mnv9Var
+syn match mnvCmdSep	"\\\@1<!|"	skipwhite nextgroup=@mnvCmdList,mnvSubst1,@mnvFunc
+syn match mnvCmdSep	":\+"	skipwhite nextgroup=@mnvCmdList,mnvSubst1
+syn match mnvCount	contained	"\d\+"
+syn match mnvIsCommand	"\<\h\w*\>"	nextgroup=mnvBang contains=mnvCommand
+syn match mnvBang	      contained	"!"
+syn match mnvWhitespace contained	"\s\+"
+
+syn region mnvSubscript contained	matchgroup=mnvSubscriptBracket start="\[" end="]" nextgroup=mnvSubscript contains=@mnvExprList
+
+syn match mnvVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnv9Super,mnv9This
+syn match mnvVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnvVarScope
+syn match mnvVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=mnvSubscript contains=mnvVarScope
+syn match mnvFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnvVarScope
+
+" match the scope prefix independently of the retrofitted scope dictionary
+syn match mnvVarScope   contained	"\<[bwglstav]:"
+syn match mnvMNVVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=mnvSubscript
+
+syn match mnvVarNameError contained "\<\h\w*\>"
+syn match mnvMNVVar	"\<v:"		nextgroup=mnvSubscript,mnvMNVVarName,mnvVarNameError
+syn match mnvOptionVar	"&\%([lg]:\)\="		nextgroup=mnvSubscript,mnvOptionVarName,mnvVarNameError
+syn cluster mnvSpecialVar	contains=mnvEnvvar,mnvLetRegister,mnvOptionVar,mnvMNVVar
+
+MNV9 syn match	mnvVar	contained	 "\<\h\w*\ze<"		nextgroup=mnv9TypeArgs
+
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
+MNV9 syn match	mnv9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=mnvLetHeredoc	contains=mnvVarScope
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=mnvSubscript
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=mnvOper	contains=mnv9Super,mnv9This
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=mnv9Super,mnv9This
+
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=mnvVar,@mnvSpecialVar
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+=<<"	skipwhite nextgroup=mnvLetHeredoc	contains=mnvVar,@mnvSpecialVar
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+\.\.="			contains=mnvVar,@mnvSpecialVar
+
+MNV9 syn match mnv9LhsRegister	"@["0-9\-a-zA-Z#=*+_/]\ze\s\+\%(\.\.\)\=="
+
+syn cluster mnvExprList	contains=@mnvSpecialVar,@mnvFunc,mnvNumber,mnvOper,mnvOperParen,mnvLambda,mnvString,mnvVar,@mnv9ExprList
+syn cluster mnv9ExprList	contains=mnv9Boolean,mnv9LambdaParams,mnv9Null
+
+" Insertions And Appends: insert append {{{2
+"   (buftype != nofile test avoids having append, change, insert show up in the command window)
+" =======================
+if &buftype != 'nofile'
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=mnvCommand end="^\.$" extend
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=mnvCommand end="^\.$" extend
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=mnvCommand end="^\.$" extend
+endif
+
+" Behave! {{{2
+" =======
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nobehaveerror")
+ syn match   mnvBehaveError contained	"[^ ]\+"
+endif
+syn match   mnvBehave	"\<be\%[have]\>"	nextgroup=mnvBehaveBang,mnvBehaveModel,mnvBehaveError skipwhite
+syn match   mnvBehaveBang	contained	"\a\@1<=!" nextgroup=mnvBehaveModel skipwhite
+syn keyword mnvBehaveModel	contained	mswin	xterm
+
+" Break* commands {{{2
+" ===============
+syn keyword	mnvBreakaddFunc	contained	func	skipwhite nextgroup=mnvBreakpointFunctionLine,mnvBreakpointFunction
+syn keyword	mnvBreakaddFile	contained	file	skipwhite nextgroup=mnvBreakpointFileLine,mnvBreakpointFilename
+syn keyword	mnvBreakaddHere	contained	here	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn keyword	mnvBreakaddExpr	contained	expr	skipwhite nextgroup=@mnvExprList
+
+syn match	mnvBreakpointGlob		contained	"*"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointNumber	contained	"\<\d\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+
+syn cluster mnvBreakpointArg contains=mnvBreakaddFunc,mnvBreakaddFile,mnvBreakaddHere,mnvBreakaddExpr
+
+syn match	mnvBreakpointFunction	contained	"\<\%(\*\|\w\)\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointFilename	contained	"\<\%(\*\|\f\)\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointFunctionLine	contained	"\<\d\+\>"		skipwhite nextgroup=mnvBreakpointFunction
+syn match	mnvBreakpointFileLine	contained	"\<\d\+\>"		skipwhite nextgroup=mnvBreakpointFilename
+
+syn keyword	mnvBreakadd	breaka[dd]	skipwhite nextgroup=@mnvBreakpointArg
+syn keyword	mnvBreakdel	breakd[el]	skipwhite nextgroup=@mnvBreakpointArg,mnvBreakpointNumber,mnvBreakpointGlob
+syn keyword	mnvBreaklist	breakl[ist]	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+
+" Call {{{2
+" ====
+syn match mnvCall	"\<call\=\>"	skipwhite nextgroup=mnvVar,@mnvFunc
+
+" Cd: {{{2
+" ==
+" GEN_SYN_MNV: mnvCommand cd, START_STR='syn keyword mnvCd', END_STR='skipwhite nextgroup=mnvCdBang,mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep'
+syn match	mnvCd	"\<chd\%[ir]\>"	skipwhite nextgroup=mnvCdBang,mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep
+syn region	mnvCdArg	contained
+      \ start=+["#|]\@!\S+
+      \ end="\ze\s*$"
+      \ end=+\ze\s*\\\@1<!["#|]+
+      \ skipwhite nextgroup=mnvComment,mnv9Comment,mnvCmdSep
+      \ contains=mnvSpecfile,@mnvWildCard
+      \ oneline
+
+syn match	mnvCdBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep
+
+" Debug {{{2
+" =====
+syn keyword	mnvDebug	deb[ug]	skipwhite nextgroup=@mnvCmdList
+
+" Debuggreedy {{{2
+" ===========
+" TODO: special-cased until generalised range/count support is implemented
+syn match	mnvDebuggreedy	"\<0\=debugg\%[reedy]\>" contains=mnvCount
+
+" Defer {{{2
+" =====
+syn match	mnvDefer	"\<defer\=\>"	skipwhite nextgroup=@mnvFunc,mnv9LambdaParams
+
+" *Do commands {{{2
+" ============
+syn match	mnvDoCommandBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvCmdList
+
+syn keyword	mnvDoCommand	argdo bufd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	tabd[o] wind[o]		skipwhite nextgroup=@mnvCmdList
+syn keyword	mnvDoCommand	cdo cfd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	ld[o] lfd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	foldd[oopen] folddoc[losed]	skipwhite nextgroup=@mnvCmdList
+
+" Exception Handling {{{2
+syn keyword	mnvThrow	th[row]	skipwhite nextgroup=@mnvExprList
+syn keyword	mnvCatch	cat[ch]	skipwhite nextgroup=mnvCatchPattern
+syn region	mnvCatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@mnvSubstList oneline
+
+" Export {{{2
+" ======
+if s:mnv9script
+  syn keyword	mnv9Export	export	skipwhite nextgroup=mnv9Abstract,mnv9ClassBody,mnv9Const,mnv9Def,mnv9EnumBody,mnv9Final,mnv9InterfaceBody,mnv9Type,mnv9Var
+endif
+
+" Filetypes {{{2
+" =========
+syn match   mnvFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=mnvFTCmd,mnvFTOption,mnvFTError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_mnvFTError")
+ syn match   mnvFTError  contained	"\I\i*"
+endif
+syn keyword mnvFTCmd    contained	filet[ype]
+syn keyword mnvFTOption contained	detect indent off on plugin
+
+" History {{{2
+" =======
+" TODO: handle MNV9 "history" variable assignment (like :wincmd, but a common variable name)
+syn keyword	mnvHistory	his[tory]	skipwhite nextgroup=mnvHistoryName,mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn keyword	mnvHistoryName	contained	c[md] s[earch] e[xpr] i[nput] d[ebug] a[ll]	skipwhite nextgroup=mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryName	contained	"[:/?=@>]"			skipwhite nextgroup=mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	"-\=\<\d\+\>\%(\s*,\)\="		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	",\s*-\=\d\+\>"			skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	"-\=\<\d\+\s*,\s*-\=\d\+\>"		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" Import {{{2
+" ======
+syn keyword	mnvImportAutoload	contained	autoload	skipwhite nextgroup=mnvImportFilename
+if s:mnv9script
+  syn region	mnvImportFilename contained
+        \ start="\S"
+        \ skip=+\%#=1
+          "\ continuation operators at SOL
+          \\n\%(\s*#.*\n\)*\s*\%([[:punct:]]\+\&[^#"'(]\)
+            \\|
+          "\ continuation operators at EOL
+          \\%(\%([[:punct:]]\+\&[^#"')]\)\s*\%(#.*\)\=\)\@<=$
+            \\|
+          \\n\%(\s*#.*\n\)*\s*as\s
+            \\|
+          \\%(^\s*#.*\)\@<=$
+            \\|
+          \\n\s*\%(\\\|#\\ \)
+        \+
+        \ matchgroup=mnvCommand
+        \ end="\s\+\zsas\ze\s\+\h"
+        \ matchgroup=NONE
+        \ end="$"
+        \ skipwhite nextgroup=mnvImportName
+        \ contains=@mnv9Continue,@mnvExprList,mnv9Comment
+        \ transparent
+else
+  syn region	mnvImportFilename contained
+        \ start="\S"
+        \ skip=+\n\s*\%(\\\|"\\ \)+
+        \ matchgroup=mnvCommand
+        \ end="\s\+\zsas\ze\s\+\h"
+        \ matchgroup=NONE
+        \ end="$"
+        \ skipwhite nextgroup=mnvImportName
+        \ contains=@mnvContinue,@mnvExprList
+        \ transparent
+endif
+syn match	mnvImportName	contained	"\%(\<as\s\+\)\@<=\h\w*\>"	skipwhite nextgroup=@mnvComment
+syn match	mnvImport		"\<imp\%[ort]\>"		skipwhite nextgroup=mnvImportAutoload,mnvImportFilename
+
+" Language {{{2
+" ========
+syn keyword 	mnvLanguage		lan[guage]	skipwhite nextgroup=@mnvLanguageName,mnvLanguageCategory,mnvSep,mnvComment,mnv9Comment
+syn keyword	mnvLanguageCategory	contained	col[late] cty[pe] mes[sages] tim[e]	skipwhite nextgroup=@mnvLanguageName
+
+" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX"
+syn match	mnvLanguageName		contained	"[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]"	nextgroup=mnvSep,mnvComment,mnv9Comment
+syn keyword	mnvLanguageNameReserved	contained	C POSIX			nextgroup=mnvSep,mnvComment,mnv9Comment
+syn cluster	mnvLanguageName	contains=mnvLanguageName,mnvLanguageNameReserved
+
+" Augroup : mnvAugroupError removed because long augroups caused sync'ing problems. {{{2
+" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
+syn cluster mnvAugroupList	contains=@mnvCmdList,mnvFilter,@mnvFunc,mnvLineComment,mnvSpecFile,mnvOper,mnvNumber,mnvOperParen,@mnvComment,mnvString,mnvSubst,mnvRegister,mnvCmplxRepeat,mnvNotation,mnvCtrlChar,mnvContinue
+
+" define
+MNVFolda syn region mnvAugroup
+      \ start="\<aug\%[roup]\>\ze\s\+\%([eE][nN][dD]\%($\|[[:space:]|"#]\)\)\@!\S"
+      \ matchgroup=mnvAugroupKey
+      \ end="\<aug\%[roup]\ze\s\+[eE][nN][dD]\s*\%($\|[|"#]\)"
+      \ skipwhite nextgroup=mnvAugroupEnd
+      \ contains=mnvAutocmd,@mnvAugroupList,mnvAugroupkey
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_noaugrouperror")
+  syn match	mnvAugroupError	"\<aug\%[roup]\s\+[eE][nN][dD]\ze\s*\%($\|[|"#]\)"
+endif
+
+" TODO: MNV9 comment
+syn match	mnvAugroupName	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+"
+      \                                                                 skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvAugroupEnd	contained	"\c\<END\>"	skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvAugroupBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvAugroupName
+syn keyword	mnvAugroupKey	contained	aug[roup] 	skipwhite nextgroup=mnvAugroupBang,mnvAugroupName,mnvAugroupEnd
+
+" remove
+syn match	mnvAugroup	"\<aug\%[roup]!"		skipwhite nextgroup=mnvAugroupName contains=mnvAugroupKey,mnvAugroupBang
+
+" list
+MNVL syn match	mnvAugroup	"\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"	skipwhite nextgroup=mnvCmdSep,mnvComment  contains=mnvAugroupKey
+MNV9 syn match 	mnvAugroup	"\<aug\%[roup]\>\ze\s*\%([#|]\|$\)"	skipwhite nextgroup=mnvCmdSep,mnv9Comment contains=mnvAugroupKey
+
+" Operators: {{{2
+" =========
+syn cluster	mnvOperGroup	contains=@mnvContinue,@mnvExprList,mnv9Comment,mnv9LineComment,mnvContinueString
+syn match	mnvOper	"\a\@<!!"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvSpecFile
+syn match	mnvOper	"||\|&&\|[-+*/%.]"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvSpecFile
+syn match	mnvOper	"?"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+" distinguish ternary : from ex-colon
+syn match	mnvOper	"\s\@1<=:\ze\s\|\s\@1<=:$"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+syn match	mnvOper	"??"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+syn match	mnvOper	"="			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn region	mnvOperParen 		matchgroup=mnvParenSep start="("    end=")" contains=@mnvOperGroup nextgroup=mnvSubscript
+syn region	mnvOperParen		matchgroup=mnvSep	     start="#\={" end="}" contains=@mnvOperGroup nextgroup=mnvSubscript,mnvVar
+syn region	mnvOperParen	contained	matchgroup=mnvSep	     start="\["	end="]" contains=@mnvOperGroup nextgroup=mnvSubscript,mnvVar
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_noopererror")
+ syn match	mnvOperError	")"
+endif
+
+syn match	mnvOperContinue		contained	"^\s*\\"        skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList contains=mnvWhitespace
+syn match         mnvOperContinueComment	contained	'^\s*["#]\\ .*' skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList contains=mnvWhitespace
+syn cluster	mnvOperContinue		contains=mnvOperContinue,mnvOperContinueComment
+
+" Lambda Expressions: {{{2
+" ==================
+syn match	mnvLambdaOperator	contained	"->" skipwhite nextgroup=@mnvExprList
+syn region	mnvLambda	contained
+      \ matchgroup=mnvLambdaBrace
+      \ start=+{\ze[[:space:][:alnum:]_.,]*\%(\n\s*\%(\\[[:space:][:alnum:]_.,]*\|"\\ .*\)\)*->+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="}" end="$"
+      \ contains=@mnvContinue,@mnvExprList,mnvLambdaParams
+syn match	mnvLambdaParams	contained	"\%({\n\=\)\@1<=\_.\{-}\%(->\)\@=" nextgroup=mnvLambdaOperator contains=@mnvContinue,mnvFunctionParam
+
+syn match	mnv9LambdaOperator   contained	"=>" skipwhite skipempty nextgroup=@mnvExprList,mnv9LambdaBlock,mnv9LambdaOperatorComment
+syn match	mnv9LambdaParen      contained	"[()]"
+syn match	mnv9LambdaParams	   contained
+      \ "(\%(\<func(\|[^(]\)*\%(\n\s*\\\%(\<func(\|[^(]\)*\|\n\s*#\\ .*\)*\ze\s\+=>"
+      \ skipwhite nextgroup=mnv9LambdaOperator
+      \ contains=@mnv9Continue,mnvDefParam,mnv9LambdaParen,mnv9LambdaReturnType
+syn region	mnv9LambdaReturnType contained	start=")\@<=:\s" end="\ze\s*#" end="\ze\s*=>" contains=@mnv9Continue,@mnvType transparent
+syn region	mnv9LambdaBlock	   contained	matchgroup=mnvSep start="{" end="^\s*\zs}" contains=@mnvDefBodyList
+
+syn match	mnv9LambdaOperatorComment contained "#.*" skipwhite skipempty nextgroup=@mnvExprList,mnv9LambdaBlock,mnv9LambdaOperatorComment
+
+" Functions: Tag is provided for those who wish to highlight tagged functions {{{2
+" =========
+syn cluster	mnvFunctionBodyCommon	contains=@mnvCmdList,mnvCmplxRepeat,mnvContinue,mnvCtrlChar,mnvDef,mnvFBVar,mnvFunction,mnvNotFunc,mnvNumber,mnvOper,mnvOperParen,mnvRegister,mnvSpecFile,mnvString,mnvSubst,mnvFunctionFold,mnvDefFold,mnvCmdSep
+syn cluster	mnvFunctionBodyList	contains=@mnvFunctionBodyCommon,mnvComment,mnvLineComment,mnvInsert,mnvConst,mnvLet,mnvSearch
+syn cluster	mnvDefBodyList		contains=@mnvFunctionBodyCommon,mnv9Comment,mnv9LineComment,mnv9Block,mnv9Const,mnv9Final,mnv9Var,mnv9Null,mnv9Boolean,mnv9For,mnv9LhsVariable,mnv9LhsVariableList,mnv9LhsRegister,mnv9Search,@mnvSpecialVar,@mnv9Func
+
+syn region	mnvFunctionPattern	contained
+      \ matchgroup=mnvOper
+      \ start="/"
+      \ end="$"
+      \ contains=@mnvSubstList
+
+syn match	mnvFunctionBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvFunctionName
+syn match	mnvDefBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvDefName
+syn match	mnvFunctionSID	contained	"\c<sid>"
+syn match	mnvFunctionScope	contained	"\<[bwglstav]:"
+syn match	mnvFunctionName	contained
+      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
+      \ skipwhite nextgroup=mnvFunctionParams,mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=mnvFunctionError,mnvFunctionScope,mnvFunctionSID,Tag
+syn match	mnvDefName	contained
+      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
+      \ nextgroup=mnvDefTypeParams,mnvDefParams,mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=mnvFunctionError,mnvFunctionScope,mnvFunctionSID,Tag
+
+syn match	mnvFunction	"\<fu\%[nction]\>"	skipwhite nextgroup=mnvFunctionBang,mnvFunctionName,mnvFunctionPattern,mnvCmdSep,mnvComment
+syn match	mnvDef	"\<def\>"		skipwhite nextgroup=mnvDefBang,mnvDefName,mnvFunctionPattern,mnvCmdSep,mnvComment
+
+syn region	mnvFunctionComment	contained
+      \ start=+".*+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="$"
+      \ skipwhite skipempty nextgroup=mnvFunctionBody,mnvEndfunction
+syn region	mnvDefComment	contained
+      \ start="#.*"
+      \ skip=+\n\s*\%(\\\|#\\ \)+
+      \ end="$"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvEnddef
+
+syn region	mnvFunctionParams	contained
+      \ matchgroup=Delimiter
+      \ start="("
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end=")"
+      \ skipwhite skipempty nextgroup=mnvFunctionBody,mnvFunctionComment,mnvEndfunction,mnvFunctionMod,mnv9CommentError
+      \ contains=mnvFunctionParam,mnvOperParen,@mnvContinue
+syn region	mnvDefParams	contained
+      \ matchgroup=Delimiter
+      \ start="("
+      \ end=")"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvDefComment,mnvEnddef,mnvReturnType,mnvCommentError
+      \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals,mnvOperParen
+syn region	mnvDefTypeParams	contained
+      \ matchgroup=Delimiter
+      \ start="<"
+      \ end=">"
+      \ nextgroup=mnvDefParams
+      \ contains=mnv9DefTypeParam
+syn match	mnvFunctionParam	contained	"\<\h\w*\>\|\.\.\."	skipwhite nextgroup=mnvFunctionParamEquals
+syn match	mnvDefParam	contained	"\<\h\w*\>"		skipwhite nextgroup=mnvParamType,mnvFunctionParamEquals
+syn match	mnv9DefTypeParam	contained	"\<\u\w*\>"
+
+syn match	mnvFunctionParamEquals contained	"="			skipwhite	  nextgroup=@mnvExprList
+syn match	mnvFunctionMod	     contained	"\<\%(abort\|closure\|dict\|range\)\>"	skipwhite skipempty nextgroup=mnvFunctionBody,mnvFunctionComment,mnvEndfunction,mnvFunctionMod,mnv9CommentError
+
+syn region	mnvFunctionBody	contained
+      \ start="^."
+      \ matchgroup=mnvCommand
+      \ end="\<endfu\%[nction]\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9CommentError
+      \ contains=@mnvFunctionBodyList
+syn region	mnvDefBody	contained
+      \ start="^."
+      \ matchgroup=mnvCommand
+      \ end="\<enddef\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+      \ contains=@mnvDefBodyList
+
+syn match	mnvEndfunction	"\<endf\%[unction]\>"	skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9CommentError
+syn match	mnvEnddef	"\<enddef\>"		skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+
+if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# 'f'
+  syn region	mnvFunctionFold
+        \ start="\<fu\%[nction]!"
+        "\ assume no dict literal in curly-brace name expressions
+        \ start="\<fu\%[nction]\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+\s*("
+        \ end="^\s*:\=\s*endf\%[unction]\>"
+        \ contains=mnvFunction
+        \ extend fold keepend transparent
+  syn region	mnvDefFold
+        \ start="\<def!"
+        "\ assume no dict literal in curly-brace name expressions
+        \ start="\<def\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+[<(]"
+        \ end="^\s*:\=\s*enddef\>"
+        \ contains=mnvDef
+        \ extend fold keepend transparent
+endif
+
+syn match	mnvDelfunctionBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvFunctionName
+syn match	mnvDelfunction			"\<delf\%[unction]\>"	skipwhite nextgroup=mnvDelfunctionBang,mnvFunctionName
+
+" Types: {{{2
+" =====
+
+syn region	mnvReturnType	contained
+      \ start=":\%(\s\|\n\)\@="
+      \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
+      \ end="$"
+      \ matchgroup=mnv9Comment
+      "\ allow for legacy script tail comment error
+      \ end="\ze[#"]"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvDefComment,mnvEnddef,mnvCommentError
+      \ contains=@mnv9Continue,@mnvType
+      \ transparent
+syn match	mnvParamType	contained	":\s"	skipwhite skipnl nextgroup=@mnvType contains=mnvTypeSep
+
+syn match	mnvTypeSep	contained	":\%(\s\|\n\)\@=" skipwhite nextgroup=@mnvType
+syn keyword	mnvType	contained	blob bool channel float job number string void
+syn keyword	mnvTypeAny	contained	any
+syn match	mnvTypeObject	contained	"\<object<\@="	nextgroup=mnvTypeObjectArgs
+syn region	mnvTypeObjectArgs	contained
+      \ matchgroup=mnvTypeObjectBracket
+      \ start="<"
+      \ end=">"
+      \ contains=mnvTypeAny,mnvTypeObject,mnvUserType
+      \ oneline
+      \ transparent
+syn match	mnvType	contained	"\<\%(func\)\>"
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<func("	          end=")" nextgroup=mnvTypeSep contains=@mnv9Continue,@mnvType transparent
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<tuple<"           end=">"                      contains=@mnv9Continue,@mnvType transparent
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<\%(list\|dict\)<" end=">"		   contains=@mnvType oneline       transparent
+syn match	mnvUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"
+
+syn cluster mnvType contains=mnvType,mnvTypeAny,mnvTypeObject,mnvCompoundType,mnvUserType
+
+" Classes, Enums And Interfaces: {{{2
+" =============================
+
+if s:mnv9script
+
+  " Methods {{{3
+  syn match	mnv9MethodDef		contained	"\<def\>"	skipwhite nextgroup=mnv9MethodDefName,mnv9ConstructorDefName
+  syn match	mnv9MethodDefName		contained	"\<\h\w*\>"	nextgroup=mnv9MethodDefParams,mnv9MethodDefTypeParams contains=@mnv9MethodName
+  syn region	mnv9MethodDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnv9MethodDefReturnType,mnvCommentError
+        \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9MethodDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9MethodDefParams
+        \ contains=mnv9DefTypeParam
+
+  syn match	mnv9ConstructorDefName	contained	"\<_\=new\w*\>"
+        \ nextgroup=mnv9ConstructorDefParams,mnv9ConstuctorDefTypeParams
+        \ contains=@mnv9MethodName
+  syn match	mnv9ConstructorDefParam	contained	"\<\%(this\.\)\=\h\w*\>"
+        \ skipwhite nextgroup=mnvParamType,mnvFunctionParamEquals
+        \ contains=mnv9This,mnvOper
+  syn region	mnv9ConstructorDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnvCommentError
+        \ contains=mnv9ConstructorDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9ConstuctorDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9ConstructorDefParams
+        \ contains=mnv9DefTypeParam
+
+  syn region	mnv9MethodDefReturnType	contained
+        \ start=":\%(\s\|\n\)\@="
+        \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
+        \ end="$"
+        \ matchgroup=mnv9Comment
+        \ end="\ze#"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnvCommentError
+        \ contains=@mnv9Continue,mnvType,mnvTypeSep
+        \ transparent
+
+  syn region	mnv9MethodDefComment	contained
+        \ start="#.*"
+        \ skip=+\n\s*\%(\\\|#\\ \)+
+        \ end="$"
+        \ skipwhite skipempty nextgroup=mnv9MethodDefBody,mnvEnddef
+
+  syn region	mnv9MethodDefBody		contained
+        \ start="^.\=" matchgroup=mnvCommand end="\<enddef\>"
+        \ skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+        \ contains=@mnv9MethodDefBodyList
+
+  syn cluster	mnv9MethodDefBodyList contains=@mnvDefBodyList,mnv9This,mnv9Super
+
+  if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvfunctionerror")
+    syn match	mnv9MethodNameError contained	"\<[a-z0-9]\i\>"
+  endif
+  syn match	mnv9MethodName	contained	"\<_\=new\w*\>"
+  syn keyword	mnv9MethodName	contained	empty len string
+
+  syn cluster	mnv9MethodName	contains=mnv9MethodName,mnv9MethodNameError
+
+  if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# 'f'
+    syn region	mnv9MethodDefFold	contained
+          \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]"
+          \ end="^\s*:\=enddef\>"
+          \ contains=mnv9MethodDef
+          \ fold keepend extend transparent
+  endif
+
+  syn cluster mnv9MethodDef contains=mnv9MethodDef,mnv9MethodDefFold
+
+  " Classes {{{3
+  syn cluster	mnv9ClassBodyList		contains=mnv9Abstract,mnv9Class,mnv9Comment,mnv9LineComment,@mnv9Continue,@mnvExprList,mnv9Extends,mnv9Implements,@mnv9MethodDef,mnv9Public,mnv9Static,mnv9Const,mnv9Final,mnv9This,mnv9Super,mnv9Var
+
+  syn match	mnv9Class		contained	"\<class\>"	skipwhite        nextgroup=mnv9ClassName
+  syn match	mnv9ClassName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Extends,mnv9Implements
+  syn match	mnv9SuperClass		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Implements
+  syn match	mnv9ImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9InterfaceListComma,mnv9Extends
+  syn match	mnv9InterfaceListComma	contained	","	skipwhite skipnl nextgroup=mnv9ImplementedInterface
+  syn keyword	mnv9Abstract			abstract	skipwhite skipnl nextgroup=mnv9ClassBody,mnv9AbstractDef
+  syn keyword	mnv9Extends		contained	extends	skipwhite skipnl nextgroup=mnv9SuperClass
+  syn keyword	mnv9Implements		contained	implements	skipwhite skipnl nextgroup=mnv9ImplementedInterface
+  syn keyword	mnv9Public		contained	public
+  syn keyword	mnv9Static		contained	static
+  " FIXME: don't match as dictionary keys, remove when operators are not
+  "        shared between MNV9 and legacy script
+  syn match	mnv9This		contained	"\.\@1<!\<this\>:\@!"
+  " super must be followed by '.'
+  syn match	mnv9Super		contained	"\.\@1<!\<super\.\@="
+
+  MNVFoldc syn region	mnv9ClassBody	start="\<class\>" matchgroup=mnvCommand end="\<endclass\>" contains=@mnv9ClassBodyList transparent
+
+  " Enums {{{3
+  syn cluster	mnv9EnumBodyList		contains=mnv9Comment,mnv9LineComment,@mnv9Continue,mnv9Enum,@mnvExprList,@mnv9MethodDef,mnv9Public,mnv9Static,mnv9Const,mnv9Final,mnv9This,mnv9Var
+
+  syn match	mnv9Enum		contained	"\<enum\>"	skipwhite           nextgroup=mnv9EnumName
+
+  syn match	mnv9EnumName		contained	"\<\u\w*\>"	skipwhite skipempty nextgroup=mnv9EnumNameTrailing,mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue,mnv9EnumImplements
+  syn match	mnv9EnumNameTrailing	contained	"\S.*"
+  syn region	mnv9EnumNameComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumNameComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+  " mnv9EnumName's "skipempty" should only apply to comments and enum values and not implements clauses
+  syn match	mnv9EnumNameEmpty		contained	"^"	skipwhite skipempty nextgroup=mnv9EnumNameComment,mnv9EnumValue
+  " allow line continuation between enum name and "implements"
+  syn match	mnv9EnumNameContinue	contained
+        \ "^\s*\\"
+        \ skipwhite skipnl nextgroup=mnv9EnumNameTrailing,mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue,mnv9EnumImplements
+        \ contains=mnvWhitespace
+  syn match	mnv9EnumNameContinueComment	contained
+        \ "^\s*#\\ .*"
+        \ skipwhite skipnl nextgroup=mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue
+        \ contains=mnvWhitespace
+  syn cluster	mnv9EnumNameContinue	contains=mnv9EnumNameContinue,mnv9EnumNameContinueComment
+
+  " enforce enum value list location
+  syn match	mnv9EnumValue		contained	"\<\a\w*\>"		  nextgroup=mnv9EnumValueTypeArgs,mnv9EnumValueArgList,mnv9EnumValueListComma,mnv9Comment
+  syn match	mnv9EnumValueListComma	contained	","	skipwhite skipempty nextgroup=mnv9EnumValue,mnv9EnumValueListCommaComment
+  syn region	mnv9EnumValueListCommaComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumValueListCommaComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+  syn region	mnv9EnumValueTypeArgs	contained
+        \ matchgroup=Delimiter
+        \ start="<\ze\a"
+        \ end=">"
+        \ nextgroup=mnv9EnumValueArgList
+        \ contains=@mnvType
+        \ oneline
+  syn region	mnv9EnumValueArgList	contained
+        \ matchgroup=mnvParenSep start="(" end=")"
+        \ nextgroup=mnv9EnumValueListComma
+        \ contains=@mnvExprList,mnvContinueString,mnv9Comment
+
+  syn keyword	mnv9EnumImplements	contained	implements	skipwhite        nextgroup=mnv9EnumImplementedInterface
+  syn match	mnv9EnumImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9EnumInterfaceListComma,mnv9EnumImplementedInterfaceComment,mnv9EnumValue
+  syn match	mnv9EnumInterfaceListComma	contained	","	skipwhite        nextgroup=mnv9EnumImplementedInterface
+  syn region	mnv9EnumImplementedInterfaceComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumImplementedInterfaceComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+
+  MNVFolde syn region	mnv9EnumBody	start="\<enum\>" matchgroup=mnvCommand end="\<endenum\>" contains=@mnv9EnumBodyList transparent
+
+  " Interfaces {{{3
+  " TODO: limit to decl only - no init values
+  syn cluster	mnv9InterfaceBodyList	contains=mnv9Comment,mnv9LineComment,@mnv9Continue,mnv9Extends,mnv9Interface,mnv9AbstractDef,mnv9Var
+
+  syn match	mnv9Interface		contained	"\<interface\>"	skipwhite nextgroup=mnv9InterfaceName
+  syn match	mnv9InterfaceName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Extends
+
+  syn keyword	mnv9AbstractDef		contained	def	skipwhite nextgroup=mnv9AbstractDefName
+  syn match	mnv9AbstractDefName	contained	"\<\h\w*\>"	skipwhite nextgroup=mnv9AbstractDefParams,mnv9AbstractDefTypeParams contains=@mnv9MethodName
+  syn region	mnv9AbstractDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnvDefComment,mnv9AbstractDefReturnType,mnvCommentError
+        \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9AbstractDefReturnType	contained
+        \ start=":\s" end="$" matchgroup=mnv9Comment end="\ze[#"]"
+        \ skipwhite skipnl nextgroup=mnvDefComment,mnvCommentError
+        \ contains=mnvTypeSep
+        \ transparent
+  syn region	mnv9AbstractDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9AbstractDefParams
+        \ contains=mnv9DefTypeParam
+
+  MNVFoldi syn region	mnv9InterfaceBody	start="\<interface\>" matchgroup=mnvCommand end="\<endinterface\>" contains=@mnv9InterfaceBodyList transparent
+
+  " Type Aliases {{{3
+  syn match	mnv9Type		"\<ty\%[pe]\>"	skipwhite nextgroup=mnv9TypeAlias,mnv9TypeAliasError
+  syn match	mnv9TypeAlias	 contained	"\<\u\w*\>"	skipwhite nextgroup=mnv9TypeEquals
+  syn match	mnv9TypeEquals	 contained	"="	skipwhite nextgroup=@mnvType
+  if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_notypealiaserror")
+    syn match	mnv9TypeAliasError contained	"\<\l\w*\>"	skipwhite nextgroup=mnv9TypeEquals
+  endif
+endif
+
+" Blocks: {{{2
+" ======
+MNV9 syn region	mnv9Block
+      \ matchgroup=mnvSep
+      \ start="{\ze\s*\%($\|[#|]\)"
+      \ end="^\s*\zs}"
+      \ skipwhite nextgroup=mnv9Comment,mnvCmdSep
+      \ contains=@mnvDefBodyList
+
+" Keymaps: {{{2
+" =======
+
+syn match  mnvKeymapStart	"^"	contained skipwhite nextgroup=mnvKeymapLhs,@mnvKeymapLineComment
+syn match  mnvKeymapLhs	"\S\+"	contained skipwhite nextgroup=mnvKeymapRhs contains=mnvNotation
+syn match  mnvKeymapRhs	"\S\+"	contained skipwhite nextgroup=mnvKeymapTailComment contains=mnvNotation
+syn match  mnvKeymapTailComment	"\S.*"	contained
+
+" TODO: remove when :" comment is matched in parts as "ex-colon comment" --djk
+if s:mnv9script
+  syn match  mnv9KeymapLineComment	"#.*"	contained contains=@mnvCommentGroup,mnvCommentString,mnv9CommentTitle
+else
+  syn match  mnvKeymapLineComment	+".*+	contained contains=@mnvCommentGroup,mnvCommentString,mnvCommentTitle
+endif
+syn cluster mnvKeymapLineComment contains=mnv9\=KeymapLineComment
+
+syn region mnvLoadkeymap matchgroup=mnvCommand start="\<loadk\%[eymap]\>" end="\%$" contains=mnvKeymapStart
+
+" Special Filenames, Modifiers, Extension Removal: {{{2
+" ===============================================
+syn match	mnvSpecFile	"<c\(word\|WORD\)>"	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%$"ms=s+1		nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"#\d\+\|[#%]<\>"		nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFileMod	"\(:[phtre]\)\+"	contained
+
+syn match	mnvSpecFile	contained		"%[ \t:]"me=e-1	nextgroup=mnvSpecFileMod
+syn match	mnvSpecFile	contained	excludenl	"%$"	nextgroup=mnvSpecFileMod
+syn match	mnvSpecFile	contained		"%<"me=e-1	nextgroup=mnvSpecFileMod
+
+" User-Specified Commands: {{{2
+" =======================
+syn cluster	mnvUserCmdList	contains=@mnvCmdList,mnvCmplxRepeat,@mnvComment,mnvCtrlChar,mnvEscapeBrace,@mnvFunc,mnvNotation,mnvNumber,mnvOper,mnvRegister,mnvSpecFile,mnvString,mnvSubst,mnvSubstRep,mnvSubstRange
+
+syn match	mnvUserCmd	"\<com\%[mand]\>!\="		skipwhite        nextgroup=mnvUserCmdAttrs,mnvUserCmdName contains=mnvBang
+syn match	mnvUserCmd	+\<com\%[mand]\>!\=\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvUserCmdAttrs,mnvUserCmdName contains=mnvBang
+
+syn region	mnvUserCmdAttrs	    contained
+      \ start="-\l"
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ end="\ze\s\u"
+      \ skipwhite nextgroup=mnvUserCmdName
+      \ contains=@mnvContinue,mnvUserCmdAttr,mnvUserCmdAttrError
+      \ transparent
+syn match	mnvUserCmdAttrError contained	"-\a\+\ze\%(\s\|=\)"
+syn match	mnvUserCmdAttr	  contained	"-addr="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrAddr
+syn match	mnvUserCmdAttr	  contained	"-bang\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-bar\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-buffer\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-complete="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrComplete,mnvUserCmdError
+syn match	mnvUserCmdAttr	  contained	"-count\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-count="		contains=mnvUserCmdAttrKey nextgroup=mnvNumber
+syn match	mnvUserCmdAttr	  contained	"-keepscript\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-nargs="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrNargs
+syn match	mnvUserCmdAttr	  contained	"-range\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-range="		contains=mnvUserCmdAttrKey nextgroup=mnvNumber,mnvUserCmdAttrRange
+syn match	mnvUserCmdAttr	  contained	"-register\>"		contains=mnvUserCmdAttrKey
+
+syn match	mnvUserCmdAttrNargs	contained	"[01*?+]"
+syn match	mnvUserCmdAttrRange	contained	"%"
+
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nousercmderror")
+ syn match	mnvUserCmdError	contained	"\S\+\>"
+endif
+
+syn case ignore
+syn keyword	mnvUserCmdAttrKey   contained	a[ddr] ban[g] bar bu[ffer] com[plete] cou[nt] k[eepscript] n[args] ra[nge] re[gister]
+
+" GEN_SYN_MNV: mnvUserCmdAttrComplete, START_STR='syn keyword mnvUserCmdAttrComplete contained', END_STR=''
+syn keyword mnvUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype function help highlight history keymap locale mapclear mapping menu messages option packadd runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
+syn keyword	mnvUserCmdAttrComplete	contained	custom customlist nextgroup=mnvUserCmdAttrCompleteFunc,mnvUserCmdError
+syn match	mnvUserCmdAttrCompleteFunc	contained	",\%([bwglstav]:\|<[sS][iI][dD]>\)\=\h\w*\%([.#]\h\w*\)*"hs=s+1 nextgroup=mnvUserCmdError contains=mnvVarScope,mnvFunctionSID
+
+" GEN_SYN_MNV: mnvUserCmdAttrAddr, START_STR='syn keyword mnvUserCmdAttrAddr contained', END_STR=''
+syn keyword mnvUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
+syn match	mnvUserCmdAttrAddr     contained	"?"
+syn case match
+
+syn match	mnvUserCmdName	    contained	"\<\u[[:alnum:]]*\>"		skipwhite        nextgroup=mnvUserCmdBlock,mnvUserCmdReplacement
+syn match	mnvUserCmdName	    contained	+\<\u[[:alnum:]]*\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvUserCmdBlock,mnvUserCmdReplacement
+syn region	mnvUserCmdReplacement contained
+      \ start="\S"
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue,@mnvUserCmdList,mnvComFilter
+      \ keepend
+syn region	mnvUserCmdBlock	    contained
+      \ matchgroup=mnvSep
+      \ start="{"
+      \ end="^\s*\zs}"
+      \ contains=@mnvDefBodyList,@mnvUserCmdList
+
+syn match	mnvDelcommand		"\<delc\%[ommand]\>"	skipwhite nextgroup=mnvDelcommandAttr,mnvDelcommandName
+syn match	mnvDelcommandAttr	contained	"-buffer\>"		skipwhite nextgroup=mnvDelcommandName
+syn match	mnvDelcommandName	contained	"\<\u[[:alnum:]]*\>"
+
+" Lower Priority Comments: after some mnv commands... {{{2
+" =======================
+if get(g:, "mnvsyn_comment_strings", 1)
+  syn region	mnvCommentString	contained oneline start='\S\s\+"'ms=e end='"' extend
+endif
+
+if s:mnv9script
+  syn cluster mnvComment contains=mnv9Comment
+else
+  syn cluster mnvComment contains=mnvComment
+endif
+
+MNVL syn region	mnvComment
+      \ excludenl
+      \ start=+"+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="$"
+      \ contains=@mnvCommentGroup,mnvCommentString
+      \ extend
+MNV9 syn region	mnv9Comment
+      \ excludenl
+      \ start="\%#=1\s\@1<=#\%({\@!\|{{\)"
+      \ skip="\n\s*\%(\\\|#\\ \)"
+      \ end="$"
+      \ contains=@mnvCommentGroup,mnvCommentString
+      \ extend
+
+syn match	mnv9CommentError	contained	"#.*"
+syn match	mnvCommentError	contained	+".*+
+
+" Environment Variables: {{{2
+" =====================
+syn match	mnvEnvvar	"\$\I\i*"
+syn match	mnvEnvvar	"\${\I\i*}"
+
+" Strings {{{2
+" =======
+
+" In-String Specials:
+" Try to catch strings, if nothing else matches (therefore it must precede the others!)
+"  mnvEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
+" syn region	mnvEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
+syn match	mnvPatSepErr	contained	"\\)"
+syn match	mnvPatSep	contained	"\\|"
+syn region	mnvPatSepZone	oneline   contained   matchgroup=mnvPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@mnvStringGroup
+syn region	mnvPatRegion	contained transparent matchgroup=mnvPatSepR start="\\[z%]\=(" end="\\)"	contains=@mnvSubstList oneline
+syn match	mnvNotPatSep	contained	"\\\\"
+syn cluster	mnvStringGroup	contains=mnvEscape,mnvEscapeBrace,mnvPatSep,mnvNotPatSep,mnvPatSepErr,mnvPatSepZone,@Spell
+syn region	mnvString	oneline keepend	matchgroup=mnvString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=mnvStringEnd end=+"+ nextgroup=mnvSubscript contains=@mnvStringGroup extend
+syn region	mnvString	oneline	matchgroup=mnvString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=mnvSubscript contains=mnvQuoteEscape  extend
+"syn region	mnvString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@mnvStringGroup  " see tst45.mnv
+
+syn match	mnvEscape	contained	"\\."
+" syn match	mnvEscape	contained	+\\[befnrt\"]+
+syn match	mnvEscape	contained	"\\\o\{1,3}\|\\[xX]\x\{1,2}\|\\u\x\{1,4}\|\\U\x\{1,8}"
+syn match	mnvEscape	contained	"\\<" contains=mnvNotation
+syn match	mnvEscape	contained	"\\<\*[^>]*>\=>"
+syn match	mnvQuoteEscape	contained	"''"
+
+syn region	mnvString	oneline matchgroup=mnvString start=+$'+ end=+'+ nextgroup=mnvSubscript contains=@mnvStringInterpolation,mnvQuoteEscape  extend
+syn region	mnvString	oneline matchgroup=mnvString start=+$"+ end=+"+ nextgroup=mnvSubscript contains=@mnvStringInterpolation,@mnvStringGroup extend
+syn region	mnvStringInterpolationExpr  oneline contained matchgroup=mnvSep start=+{+ end=+}+ contains=@mnvExprList
+syn match	mnvStringInterpolationBrace contained "{{"
+syn match	mnvStringInterpolationBrace contained "}}"
+syn cluster	mnvStringInterpolation contains=mnvStringInterpolationExpr,mnvStringInterpolationBrace
+
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringGroup
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,mnvQuoteEscape
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringInterpolation,@mnvStringGroup
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringInterpolation,mnvQuoteEscape
+
+" Substitutions: {{{2
+" =============
+syn cluster	mnvSubstList	contains=mnvPatSep,mnvPatRegion,mnvPatSepErr,mnvSubstTwoBS,mnvSubstRange,mnvNotation
+syn cluster	mnvSubstRepList	contains=mnvSubstSubstr,mnvSubstTwoBS,mnvNotation
+syn cluster	mnvSubstList	add=mnvCollection
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\>"		skipwhite nextgroup=mnvSubstPat,mnvSubstFlags,mnvSubstCount
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=mnvSubstPat
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\>"		skipwhite nextgroup=mnvSubstPat,mnvSubstFlags,mnvSubstCount
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=mnvSubstPat
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubstFlagErr	contained	"[^< \t\r|]\+" contains=mnvSubstFlags
+" & and # after :s are always pattern delimiters not flags
+syn match	mnvSubstFlags	contained	"[&cegiIlnpr#]\+"	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubstCount	contained	"\d\+\>"
+" TODO: MNV9 illegal separators for abbreviated :s form are [-.:], :su\%[...] required
+"     : # is allowed but "not recommended" (see :h pattern-delimiter)
+syn region	mnvSubstPat	contained	matchgroup=mnvSubstDelim start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	contains=@mnvSubstList	nextgroup=mnvSubstRep4	oneline
+syn region	mnvSubstRep4	contained	matchgroup=mnvSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=mnvNotation end="<[cC][rR]>"	contains=@mnvSubstRepList	nextgroup=mnvSubstFlagErr	oneline
+syn region	mnvCollection	contained 	transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=mnvCollClass
+syn match	mnvCollClassErr	contained	"\[:.\{-\}:\]"
+syn match	mnvCollClass	contained 	transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|retu\%[rn]\|tab\|escape\|backspace\):\]"
+syn match	mnvSubstSubstr	contained	"\\z\=\d"
+syn match	mnvSubstTwoBS	contained	"\\\\"
+
+" TODO: flags, unlike count, must follow immediately
+"     : distinguish from with MNV9 &var
+" syn match	mnvSubst		"^\s*\zs&&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst		"^\s*\zs\~&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst1	contained	"&&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst1	contained	"\~&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+
+" two and three letter variants (matched as :s + flags, count may follow immediately)
+syn match	mnvSubst		"^\s*\zssc[egiIlnp]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssi[ceInpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssI[ceginplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssr[cgiInplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+
+syn match	mnvSubst1	contained	"\<sc[egiIlnp]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<si[ceInpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sI[ceginplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sr[cgiInplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+
+" Vi compatibility
+syn match	mnvSubstDelim	contained	"\\"
+syn match	mnvSubstPat	contained	"\\\ze[/?&]" contains=mnvSubstDelim nextgroup=mnvSubstRep4
+
+" Mark: {{{2
+" ====
+MNVL syn match	mnvExMark	"\<k\%([a-zA-Z0-9]\>\|[[\]<>'`]\)\@="         nextgroup=@mnvMarkArg
+MNVL syn match	mnvExMark	"\<k\>"	      	skipwhite nextgroup=@mnvMarkArg
+syn match	mnvExMark	"\<mark\>"	      	skipwhite nextgroup=@mnvMarkArg
+
+syn match	mnvMarkArg	contained	"[a-zA-Z]\>\|[[\]<>'`]"	skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvMarkArgError	contained	"["^.(){}0-9]"
+syn cluster	mnvMarkArg	contains=mnvMarkArg,mnvMarkArgError
+
+" Marks, Registers, Addresses, Filters: {{{2
+syn match	mnvMark	"'[a-zA-Z0-9]\ze\s*$"
+syn match	mnvMark	"'[[\]{}()<>'`"^.]\ze\s*$"
+syn match	mnvMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	"'[[\]{}()<>'`"^.]\ze[-+,!]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	",\zs'[[\]{}()<>'`"^.]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMarkNumber	"[-+]\d\+"		contained contains=mnvOper nextgroup=mnvSubst1
+syn match	mnvPlainMark contained	"'[a-zA-Z0-9]"
+syn match	mnvRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=mnvMark	skipwhite nextgroup=mnvFilter
+
+syn match	mnvRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
+syn match	mnvRegister	'@"'
+syn match	mnvLetRegister	contained	'@["@0-9\-a-zA-Z:.%#=*+~_/]'
+
+syn match	mnvAddress	",\zs[.$]"	skipwhite nextgroup=mnvSubst1
+syn match	mnvAddress	"%\ze\a"	skipwhite nextgroup=mnvString,mnvSubst1
+
+syn match	mnvFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=mnvOper,mnvSpecFile
+syn match	mnvFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=mnvOper,mnvSpecFile
+syn match	mnvComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=mnvOper,mnvSpecFile
+
+" Complex Repeats: (:h complex-repeat) {{{2
+" ===============
+syn match	mnvCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
+
+" NOTE: :* as an alias for :@ is not supported, this is considered a :range,
+" see :help cpo-star
+syn match	mnvAtArg	contained	+@\@1<=[0-9a-z".=*+:@]+
+syn match	mnvAt	+@[0-9a-z".=*+:@]\ze\s*\%($\|[|"#]\)+	skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment contains=mnvAtArg
+" MNV9: avoid LHS assignment mismatching of :@["#]
+syn match	mnvAt	+@\ze\s*\%($\||\|\s["#]\)+		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" Set command and associated set-options (mnvOptions) with comment {{{2
+syn match	mnvSet		"\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skipwhite nextgroup=mnvSetBang,mnvCmdSep,mnvComment,mnvSetArgs
+syn region	mnvSetComment	contained	start=+"+ skip=+\n\s*\%(\\\||"\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString extend
+syn match	mnvSetCmdSep	contained	"|" skipwhite nextgroup=@mnvCmdList,mnvSubst1,@mnvFunc
+syn match	mnvSetEscape	contained	"\\\%(\\[|"]\|.\)"
+syn match	mnvSetBarEscape	contained	"\\|"
+syn match	mnvSetQuoteEscape	contained	+\\"+
+syn region	mnvSetArgs	contained
+      \ start="\l\|<"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*"\\ +
+      \ end=+\ze\\\@1<![|"]+
+      "\ assume this isn't an escaped char with backslash on the previous line
+      \ end=+^\s*\\\ze[|"]+
+      \ end="\ze\s#"
+      \ end="$"
+      \ nextgroup=mnvSetCmdSep,mnvSetComment,mnv9Comment
+      \ contains=@mnvContinue,mnvErrSetting,mnvOption,mnvSetAll,mnvSetTermcap
+      \ keepend
+" TODO: restrict this to valid values?
+syn match	mnvOption	contained	"<[^>]\+>"	contains=mnvOption
+syn region	mnvSetEqual	contained
+      \ matchgroup=mnvOper
+      \ start="[=:]\|[-+^]="
+      \ skip=+\\\s\|^\s*\%(\\\|["#]\\ \)+
+      \ end="\ze\s"
+      \ contains=@mnvContinue,mnvCtrlChar,mnvEnvvar,mnvNotation,mnvSetSep,mnvSetEscape,mnvSetBarEscape,mnvSetQuoteEscape
+syn match	mnvSetBang	contained	"\a\@1<=!" skipwhite nextgroup=mnvSetAll,mnvSetTermcap
+syn keyword	mnvSetAll	contained	all nextgroup=mnvSetMod
+syn keyword	mnvSetTermcap	contained	termcap
+syn match	mnvSetSep	contained	"[,:]"
+syn match	mnvSetMod	contained	"\a\@1<=\%(&mnv\=\|[!&?<]\)"
+
+" Variable Declarations: {{{2
+" =====================
+MNVL syn keyword	mnvLet	let		skipwhite nextgroup=@mnvSpecialVar,mnvVar,mnvVarList,mnvLetVar
+MNVL syn keyword	mnvConst	cons[t]		skipwhite nextgroup=@mnvSpecialVar,mnvVar,mnvVarList,mnvLetVar
+syn region	mnvVarList	contained
+      \ start="\[" end="]"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnvContinue,@mnvSpecialVar,mnvVar
+syn match	mnvLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=mnvLetVarSubscript,mnvLetHeredoc	contains=mnvVarScope,mnvSubscript
+hi link mnvLetVar mnvVar
+syn region	mnvLetVarSubscript contained
+      \ matchgroup=mnvSubscriptBracket
+      \ start="\S\@1<=\["
+      \ end="]"
+      \ skipwhite nextgroup=mnvLetVarSubscript,mnvLetHeredoc
+      \ contains=@mnvExprList
+
+syn keyword	mnvUnlet		unl[et]	skipwhite nextgroup=mnvUnletBang,mnvUnletVars
+syn match	mnvUnletBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvUnletVars
+syn region	mnvUnletVars	contained
+      \ start="$\I\|\h" skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*["#]\\ + end="$" end=+\ze\s*[|"#]+
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=@mnvContinue,mnvEnvvar,mnvVar,mnvMNVVar
+
+" TODO: type error after register or environment variables (strings)
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*trim\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1\=\z2$"
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="=<<\%(\s*\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop end="^\z1$"
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*\%(trim\s\+eval\|eval\s\+trim\)\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1\=\z2$"
+      \ contains=@mnvStringInterpolation
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="=<<\s*eval\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1$"
+      \ contains=@mnvStringInterpolation
+      \ extend
+
+MNV9 syn keyword	mnv9Const	const	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+MNV9 syn keyword	mnv9Final	final	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+MNV9 syn keyword	mnv9Var	var	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+
+syn match	mnv9Variable	contained	"\<\h\w*\>"	skipwhite nextgroup=mnv9VariableTypeSep,mnvLetHeredoc,mnvOper
+syn region	mnv9VariableList	contained	start="\[" end="]" contains=@mnvContinue,@mnvSpecialVar,mnv9Variable skipwhite nextgroup=mnvLetHeredoc
+
+syn match	mnv9VariableTypeSep	contained	"\S\@1<=:\%(\s\|\n\)\@="		skipwhite nextgroup=@mnv9VariableType
+syn keyword	mnv9VariableType		contained	blob bool channel float job number string void	skipwhite nextgroup=mnvLetHeredoc
+syn keyword	mnv9VariableTypeAny	contained	any			skipwhite nextgroup=mnvLetHeredoc
+syn match	mnv9VariableTypeObject	contained	"\<object<\@="			          nextgroup=mnv9VariableTypeObjectArgs
+syn region	mnv9VariableTypeObjectArgs
+      \ matchgroup=mnv9VariableTypeObjectBracket
+      \ start="<"
+      \ end=">"
+      \ contains=mnvTypeAny,mnvTypeObject,mnvUserType
+      \ oneline
+      \ transparent
+syn match	mnv9VariableType		contained	"\<\%(func\)\>"			skipwhite nextgroup=mnvLetHeredoc
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<func("
+      \ end=")"
+      \ skipwhite nextgroup=mnv9VariableTypeSep,mnvLetHeredoc
+      \ contains=@mnv9Continue,@mnv9VariableType
+      \ transparent
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<tuple<"
+      \ end=">"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnv9Continue,@mnv9VariableType
+      \ transparent
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<\%(list\|dict\)<"
+      \ end=">"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnv9VariableType
+      \ oneline
+      \ transparent
+syn match	mnv9VariableUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"	skipwhite nextgroup=mnvLetHeredoc
+
+syn cluster mnv9VariableType contains=mnv9VariableType,mnv9VariableTypeAny,mnv9VariableTypeObject,mnv9VariableCompoundType,mnv9VariableUserType
+
+" Lockvar and Unlockvar: {{{2
+" =====================
+syn keyword	mnvLockvar	lockv[ar]	skipwhite nextgroup=mnvLockvarBang,mnvLockvarDepth,mnvLockvarVars
+syn keyword	mnvUnlockvar	unlo[ckvar]	skipwhite nextgroup=mnvLockvarBang,mnvLockvarDepth,mnvLockvarVars
+syn match	mnvLockvarBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvLockvarVars
+syn match	mnvLockvarDepth	contained	"\<[0-3]\>"	skipwhite nextgroup=mnvLockvarVars
+syn region	mnvLockvarVars	contained
+      \ start="\h" skip=+\n\s*\%(\\\|"\\ \)\|^\s*"\\ + end="$" end="\ze[|"]"
+      \ nextgroup=mnvCmdSep,mnvComment
+      \ contains=@mnvContinue,mnvVar
+
+hi def link mnvLockvar mnvCommand
+hi def link mnvUnlockvar mnvCommand
+hi def link mnvLockvarBang mnvBang
+hi def link mnvLockvarDepth mnvNumber
+
+" For: {{{2
+" ===
+" handles MNV9 and legacy for now
+syn region	mnvFor
+      \ matchgroup=mnvCommand
+      \ start="\<for\>" end="\<in\>"
+      \ skipwhite skipnl nextgroup=@mnvForInContinue,mnv9ForInComment,@mnvExprList
+      \ contains=@mnvContinue,mnvVar,mnvVarList,mnv9Variable,mnv9VariableList
+      \ transparent
+
+syn match	mnv9ForInComment		contained	"#.*"	skipwhite skipempty nextgroup=mnvForInComment,@mnvExprList
+
+syn match	mnvForInContinue		contained	"^\s*\zs\\"	 skipwhite skipnl nextgroup=@mnvForInContinue,@mnvExprList
+syn match         mnvForInContinueComment	contained	'^\s*\zs["#]\\ .*' skipwhite skipnl nextgroup=@mnvForInContinue,@mnvExprList
+syn cluster	mnvForInContinue		contains=mnvForInContinue,mnvForInContinueComment
+
+" Abbreviations: {{{2
+" =============
+" GEN_SYN_MNV: mnvCommand abbrev, START_STR='syn keyword mnvAbb', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+" GEN_SYN_MNV: mnvCommand abclear, START_STR='syn keyword mnvAbb', END_STR='skipwhite nextgroup=mnvMapMod'
+
+" Filename Patterns: {{{2
+" =================
+
+syn match	mnvWildcardQuestion	contained	"?"
+syn match	mnvWildcardStar		contained	"*"
+
+syn match	mnvWildcardBraceComma	contained	","
+syn region	mnvWildcardBrace		contained
+      \ matchgroup=mnvWildcard
+      \ start="{"
+      \ end="}"
+      \ contains=mnvWildcardEscape,mnvWildcardBrace,mnvWildcardBraceComma,mnvWildcardQuestion,mnvWildcardStar,mnvWildcardBracket
+      \ oneline
+
+syn match	mnvWildcardIntervalNumber	contained	"\d\+"
+syn match	mnvWildcardInterval	contained	"\\\\\\{\d\+\%(,\d\+\)\=\\}" contains=mnvWildcardIntervalNumber
+
+
+syn match	mnvWildcardBracket	contained	"\[\%(\^\=]\=\%(\\.\|\[\([:.=]\)[^:.=]\+\1]\|[^][:space:]]\)*\)\@>]"
+      \ contains=mnvWildcardBracketStart,mnvWildcardEscape
+
+syn match	mnvWildcardBracketCharacter	contained	"."	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketHyphen,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketRightBracket	contained	"]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketHyphen	contained	"-]\@!"	nextgroup=@mnvWildcardBracketCharacter
+syn match	mnvWildcardBracketEscape	contained	"\\."	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketHyphen,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketCharacterClass	contained	"\[:[^:]\+:]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketEquivalenceClass	contained	"\[=[^=]\+=]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketCollatingSymbol	contained	"\[\.[^.]\+\.]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+
+syn match	mnvWildcardBracketStart	contained	"\["	nextgroup=mnvWildcardBracketCaret,mnvWildcardBracketRightBracket,@mnvWildcardBracketCharacter
+syn match	mnvWildcardBracketCaret	contained	"\^"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketRightBracket
+syn match	mnvWildcardBracketEnd	contained	"]"
+
+syn cluster	mnvWildcardBracketCharacter	contains=mnvWildcardBracketCharacter,mnvWildcardBracketEscape,mnvWildcardBracketCharacterClass,mnvWildcardBracketEquivalenceClass,mnvWildcardBracketCollatingSymbol
+
+syn match	mnvWildcardEscape	contained	"\\."
+
+syn cluster	mnvWildcard		contains=mnvWildcardQuestion,mnvWildcardStar,mnvWildcardBrace,mnvWildcardBracket,mnvWildcardInterval
+
+" Autocmd and Doauto{cmd,all}: {{{2
+" ===========================
+
+" TODO: explicitly match the {cmd} arg rather than bailing out to TOP
+syn region	mnvAutocmdBlock	contained	matchgroup=mnvSep start="{" end="^\s*\zs}" contains=@mnvDefBodyList
+
+syn match	mnvAutocmdGroup	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+" skipwhite nextgroup=mnvAutoEvent,mnvAutoEventGlob
+syn match	mnvAutocmdBang	contained	"\a\@1<=!"		     skipwhite nextgroup=mnvAutocmdGroup,mnvAutoEvent,mnvAutoEventGlob
+
+" TODO: cleaner handling of | in pattern position
+"     : match pattern items in addition to wildcards
+syn region	mnvAutocmdPattern	contained
+      \ start="|\@!\S"
+      \ skip="\\\\\|\\[,[:space:]]"
+      \ end="\ze[,[:space:]]"
+      \ end="$"
+      \ skipwhite nextgroup=mnvAutocmdPatternSep,mnvAutocmdMod,mnvAutocmdBlock,@mnvFunc
+      \ contains=mnvEnvvar,@mnvWildcard,mnvAutocmdPatternEscape
+syn match	mnvAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=mnvAutocmdPatternSep,mnvAutocmdMod,mnvAutocmdBlock,@mnvFunc
+" trailing pattern separator comma allowed
+syn match	mnvAutocmdPatternSep	contained	","	                skipwhite nextgroup=@mnvAutocmdPattern,mnvAutocmdMod,mnvAutocmdBlock
+syn match	mnvAutocmdPatternEscape	contained	"\\."
+syn cluster	mnvAutocmdPattern		contains=mnvAutocmdPattern,mnvAutocmdBufferPattern
+
+" TODO: MNV9 requires '++' prefix
+syn match	mnvAutocmdMod	contained	"\%(++\)\=\<nested\>" skipwhite nextgroup=mnvAutocmdMod,mnvAutocmdBlock
+syn match	mnvAutocmdMod	contained	"++once\>"	skipwhite nextgroup=mnvAutocmdMod,mnvAutocmdBlock
+
+" higher priority than mnvAutocmdGroup, assume no group is so named
+syn match	mnvAutoEventGlob	contained	"*"	skipwhite nextgroup=@mnvAutocmdPattern
+syn match	mnvAutoEventSep	contained	"\a\@1<=,"	nextgroup=mnvAutoEvent
+syn match	mnvUserAutoEventSep contained	"\a\@1<=,"	nextgroup=mnvUserAutoEvent
+
+syn match	mnvAutocmd		"\<au\%[tocmd]\>"	skipwhite nextgroup=mnvAutocmdBang,mnvAutocmdGroup,mnvAutoEvent,mnvAutoEventGlob
+
+
+syn match	mnvDoautocmdMod	contained	"<nomodeline>"		skipwhite nextgroup=mnvAutocmdGroup,mnvAutoEvent
+syn match	mnvDoautocmd		"\<do\%[autocmd]\>"	skipwhite nextgroup=mnvDoautocmdMod,mnvAutocmdGroup,mnvAutoEvent
+syn match	mnvDoautocmd		"\<doautoa\%[ll]\>"	skipwhite nextgroup=mnvDoautocmdMod,mnvAutocmdGroup,mnvAutoEvent
+
+" Echo And Execute: -- prefer strings! {{{2
+" ================
+" NOTE: No trailing comments
+
+syn region	mnvEcho
+      \ matchgroup=mnvCommand
+      \ start="\<ec\%[ho]\>"
+      \ start="\<echoe\%[rr]\>"
+      \ start="\<echom\%[sg]\>"
+      \ start="\<echoc\%[onsole]\>"
+      \ start="\<echon\>"
+      \ start="\<echow\%[indow]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment
+      \ transparent
+
+syn match	mnvEchohl	"\<echohl\=\>"	skipwhite nextgroup=mnvGroup,mnvHLGroup,mnvEchohlNone
+syn case ignore
+syn keyword	mnvEchohlNone	contained none
+syn case match
+
+syn cluster	mnvEcho	contains=mnvEcho,mnvEchohl
+
+syn region	mnvExecute
+      \ matchgroup=mnvCommand
+      \ start="\<exe\%[cute]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment
+      \ transparent
+
+syn region	mnvEval
+      \ matchgroup=mnvCommand
+      \ start="\<ev\%[al]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment,mnvComment
+      \ transparent
+
+" Filter: {{{2
+" ======
+syn match	mnvExFilter		"\<filt\%[er]\>"	skipwhite nextgroup=mnvExFilterBang,mnvExFilterPattern
+syn region	mnvExFilterPattern contained
+      \ start="[[:ident:]]"
+      \ end="\ze[[:space:]\n]"
+      \ skipwhite nextgroup=@mnvCmdList
+      \ contains=@mnvSubstList
+      \ oneline
+syn region	mnvExFilterPattern contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:ident:]|"]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvCmdList
+      \ contains=@mnvSubstList
+      \ oneline
+syn match	mnvExFilterBang	 contained	"\a\@1<=!"	skipwhite nextgroup=mnvExFilterPattern
+
+" Grep and Make: {{{2
+" =============
+" | is the command separator, escaped with \| all other backslashes are passed through literally, no tail comments
+syn match	mnvGrep		"\<l\=gr\%[ep]\>"		skipwhite nextgroup=mnvGrepBang,mnvGrepArgs,mnvCmdSep
+syn match	mnvGrepadd		"\<l\=grepa\%[dd]\>"	skipwhite nextgroup=mnvGrepBang,mnvGrepArgs,mnvCmdSep
+syn region	mnvGrepArgs	contained
+      \ start="|\@!\S"
+      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="$"
+      "\ TODO: include mnvSpecFile
+      \ contains=mnvGrepBarEscape
+syn match	mnvGrepBarEscape	contained	"\\|"
+syn match	mnvGrepBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvGrepArgs,mnvCmdSep
+
+syn match	mnvMake		"\<l\=make\=\>"		skipwhite nextgroup=mnvMakeBang,mnvMakeArgs,mnvCmdSep
+syn region	mnvMakeArgs	contained
+      \ start="|\@!\S"
+      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="$"
+      "\ TODO: include mnvSpecFile
+      \ contains=mnvMakeBarEscape
+syn match	mnvMakeBarEscape	contained	"\\|"
+syn match	mnvMakeBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvMakeArgs,mnvCmdSep
+
+" Help*: {{{2
+" =====
+syn match	mnvHelp	"\<h\%[elp]\>"	skipwhite nextgroup=mnvHelpBang,mnvHelpArg,mnvHelpNextCommand
+" TODO: match wildcards, ignoring exceptions?
+syn region	mnvHelpArg	contained
+      \ start="\S"
+      \ matchgroup=Special
+      \ end="\%(@\a\a\)\=\ze\s*\%($\|\%x0d\|\%x00\||[^|]\)"
+      \ oneline
+syn match	mnvHelpNextCommand	contained	"\ze|[^|]"	skipwhite nextgroup=mnvCmdSep
+syn match	mnvHelpBang		contained	"\a\@1<=!"	skipwhite nextgroup=mnvHelpArg,mnvHelpNextCommand
+
+syn match	mnvHelpgrep		"\<l\=helpg\%[rep]\>"	skipwhite nextgroup=mnvHelpgrepBang,mnvHelpgrepPattern
+syn region	mnvHelpgrepPattern	contained
+      \ start="\S"
+      \ matchgroup=Special
+      \ end="@\a\a\>"
+      \ end="$"
+      \ contains=@mnvSubstList
+      \ oneline
+
+" MNVgrep: {{{2
+" =======
+syn match	mnvMNVgrep		"\<l\=mnv\%[grep]\>"	skipwhite nextgroup=mnvMNVgrepBang,mnvMNVgrepPattern
+syn match	mnvMNVgrepadd		"\<l\=mnvgrepa\%[dd]\>"	skipwhite nextgroup=mnvMNVgrepBang,mnvMNVgrepPattern
+syn match	mnvMNVgrepBang	  contained	"\a\@1<=!"		skipwhite nextgroup=mnvMNVgrepPattern
+syn region	mnvMNVgrepPattern   contained
+      \ start="[[:ident:]]"
+      \ end="\ze[[:space:]\n]"
+      \ skipwhite nextgroup=mnvMNVgrepFile,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+syn region	mnvMNVgrepPattern   contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:ident:]|"]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=mnvMNVgrepFlags,mnvMNVgrepFile,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+syn match	mnvMNVgrepEscape	  contained	"\\\%(\\|\|.\)"
+syn match	mnvMNVgrepBarEscape contained	"\\|"
+syn region	mnvMNVgrepFile	  contained
+      \ start="|\@!\S"
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="\ze\s"
+      \ end="$"
+      \ skipwhite nextgroup=mnvMNVgrepFile
+      \ contains=mnvSpecFile,mnvMNVgrepEscape,mnvMNVgrepBarEscape
+syn match	mnvMNVgrepFlags	  contained	"\<[gjf]\{,3\}\>" skipwhite nextgroup=mnvMNVgrepfile
+
+" Maps: {{{2
+" ====
+" GEN_SYN_MNV: mnvCommand map, START_STR='syn keyword mnvMap', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+syn match	mnvMap	"\<map\>"	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+syn keyword	mnvMap	no[remap]	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+" GEN_SYN_MNV: mnvCommand mapclear, START_STR='syn keyword mnvMap', END_STR='skipwhite nextgroup=mnvMapMod'
+syn keyword	mnvMap	mapc[lear]	skipwhite nextgroup=mnvMapBang,mnvMapMod
+" GEN_SYN_MNV: mnvCommand unmap, START_STR='syn keyword mnvUnmap', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+syn keyword	mnvUnmap	unm[ap]	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+
+syn match	mnvMapLhs	contained	"\%(.\|\S\)\+"		contains=mnvCtrlChar,mnvNotation,mnvMapLeader skipwhite        nextgroup=mnvMapRhs
+syn match	mnvMapLhs	contained	"\%(.\|\S\)\+\ze\s*$"	contains=mnvCtrlChar,mnvNotation,mnvMapLeader skipwhite skipnl nextgroup=mnvMapRhsContinue
+syn match	mnvMapBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn match	mnvMapMod	contained	"\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=mnvMapModKey,mnvMapModErr skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn region	mnvMapRhs	contained
+      \ start="\S"
+      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,mnvCtrlChar,mnvNotation,mnvMapLeader
+syn region	mnvMapRhsContinue	contained
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,mnvCtrlChar,mnvNotation,mnvMapLeader
+syn match	mnvMapLeader	contained	"\%#=1\c<\%(local\)\=leader>"	contains=mnvMapLeaderKey
+syn keyword	mnvMapModKey	contained	buffer expr nowait script silent special unique
+syn case ignore
+syn keyword	mnvMapLeaderKey	contained	leader localleader
+syn case match
+
+" Menus: {{{2
+" =====
+" NOTE: tail comments disallowed
+" GEN_SYN_MNV: mnvCommand menu, START_STR='syn keyword mnvMenu', END_STR='skipwhite nextgroup=mnvMenuBang,mnvMenuMod,mnvMenuName,mnvMenuPriority,mnvMenuStatus'
+syn keyword mnvMenu popu[p] skipwhite nextgroup=mnvMenuBang,mnvMenuName
+syn region	mnvMenuRhs	 contained contains=@mnvContinue,mnvNotation start="|\@!\S"            skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=mnvSep end="|"
+syn region	mnvMenuRhsContinue contained contains=@mnvContinue,mnvNotation start=+^\s*\%(\\\|"\\ \)+ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=mnvSep end="|"
+syn match	mnvMenuName	"\.\@!\%(\\\s\|\S\)\+"        contained contains=mnvMenuNotation,mnvNotation skipwhite        nextgroup=mnvCmdSep,mnvMenuRhs
+syn match	mnvMenuName	"\.\@!\%(\\\s\|\S\)\+\ze\s*$" contained contains=mnvMenuNotation,mnvNotation skipwhite skipnl nextgroup=mnvCmdSep,mnvMenuRhsContinue
+syn match	mnvMenuNotation	"&\a\|&&\|\\\s\|\\\." contained
+syn match	mnvMenuPriority	"\<\d\+\%(\.\d\+\)*\>" contained skipwhite nextgroup=mnvMenuName
+syn match	mnvMenuMod	"\c<\%(script\|silent\|special\)>" contained skipwhite nextgroup=mnvMenuName,mnvMenuPriority,mnvMenuMod contains=mnvMapModKey,mnvMapModErr
+syn keyword	mnvMenuStatus	enable disable nextgroup=mnvMenuName skipwhite
+syn match	mnvMenuBang	"\a\@1<=!" contained skipwhite nextgroup=mnvMenuName,mnvMenuMod
+
+syn region	mnvMenutranslate
+      \ matchgroup=mnvCommand start="\<menut\%[ranslate]\>"
+      \ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+
+      \ end="$" matchgroup=mnvCmdSep end="|" matchgroup=mnvMenuClear end="\<clear\ze\s*\%(["#|]\|$\)"
+      \ contains=@mnvContinue,mnvMenutranslateName keepend transparent
+" oneline is sufficient to match the current formatting in runtime/lang/*.mnv
+syn match	mnvMenutranslateName "\%(\\\s\|\S\)\+" contained contains=mnvMenuNotation,mnvNotation
+syn match	mnvMenutranslateComment +".*+ contained containedin=mnvMenutranslate
+
+" If, While and Return: {{{2
+" ====================
+syn match	mnvNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@mnvExprList,mnvNotation
+syn match	mnvElse	"\<el\%[se]\>"			skipwhite nextgroup=mnvComment,mnv9Comment
+syn match	mnvEndif	"\<en\%[dif]\>"			skipwhite nextgroup=mnvComment,mnv9Comment
+
+" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
+" ======================
+syn case ignore
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}x\=\%(f\d\{1,2}\|[^ \t:]\|space\|bar\|bslash\|nl\|newline\|lf\|linefeed\|cr\|retu\%[rn]\|enter\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|csi\|right\|paste\%(start\|end\)\|left\|help\|undo\|k\=insert\|ins\|mouse\|[kz]\=home\|[kz]\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\%(page\)\=\%(\|down\|up\|k\d\>\)\)>" contains=mnvBracket
+
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(net\|dec\|jsb\|pterm\|urxvt\|sgr\)mouse>"		contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(left\|middle\|right\)\%(mouse\|drag\|release\)>"	contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}left\%(mouse\|release\)nm>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}x[12]\%(mouse\|drag\|release\)>"		contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}sgrmouserelease>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}mouse\%(up\|down\|move\)>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}scrollwheel\%(up\|down\|right\|left\)>"		contains=mnvBracket
+
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(sid\|nop\|nul\|lt\|drop\)>"				contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(snr\|plug\|cursorhold\|ignore\|cmd\|scriptcmd\|focus\%(gained\|lost\)\)>"	contains=mnvBracket
+" syn match	mnvNotation	contained	'\%(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=mnvBracket
+syn match	mnvNotation	contained	'\%#=1\%(\\\|<lt>\)\=<\%([fq]-\)\=\%(line[12]\|count\|bang\|reg\|args\|mods\|lt\)>'		contains=mnvBracket skipwhite nextgroup=mnvSubst1
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([cas]file\|abuf\|amatch\|cexpr\|cword\|cWORD\|client\|stack\|script\|sf\=lnum\)>"	contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}char-\%(\d\+\|0\o\+\|0x\x\+\)>"		contains=mnvBracket
+
+syn match	mnvBracket contained	"[\\<>]"
+syn case match
+
+" User Command Highlighting: {{{2
+syn match mnvUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
+
+" MNV user commands
+
+" Compiler plugins
+syn match	mnvCompilerSet	"\<CompilerSet\>"	skipwhite nextgroup=mnvSetArgs
+
+" runtime/makemenu.mnv
+syn match	mnvSynMenu		"\<SynMenu\>"	skipwhite nextgroup=mnvSynMenuPath
+syn match	mnvSynMenuPath	contained	".*\ze:"	nextgroup=mnvSynMenuColon contains=mnvMenuNotation
+syn match	mnvSynMenuColon	contained	":"	nextgroup=mnvSynMenuName
+syn match	mnvSynMenuName	contained	"\w\+"
+
+" runtime/syntax/syncolor.mnv
+syn match	mnvSynColor		"\<SynColor\>"	skipwhite nextgroup=mnvSynColorGroup
+syn match	mnvSynColorGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvHiKeyList	contains=mnvGroup
+syn match	mnvSynLink		"\<SynLink\>"	skipwhite nextgroup=mnvSynLinkGroup
+syn match	mnvSynLinkGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvGroup	contains=mnvGroup
+
+syn cluster mnvExUserCmdList contains=mnvCompilerSet,mnvSynColor,mnvSynLink,mnvSynMenu
+
+" Errors And Warnings: {{{2
+" ====================
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvfunctionerror")
+ syn match	mnvFunctionError	contained	"[[:space:]!]\@1<=\<[a-z0-9]\w\{-}\ze\s*("
+ syn match	mnvFunctionError	contained	"\%(<[sS][iI][dD]>\|[sg]:\)\d\w\{-}\ze\s*("
+ syn match	mnvElseIfErr	"\<else\s\+if\>"
+ syn match	mnvBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
+endif
+
+" Match: {{{2
+" =====
+syn match	mnvMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=mnvMatchGroup,mnvMatchNone contains=mnvCount
+syn match	mnvMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=mnvMatchPattern
+syn case ignore
+syn keyword	mnvMatchNone	contained	none
+syn case match
+syn region	mnvMatchPattern	contained
+      \ matchgroup=Delimiter
+      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ contains=@mnvSubstList
+      \ oneline
+
+" Normal: {{{2
+" ======
+syn match	mnvNormal		"\<norm\%[al]\>!\=" skipwhite nextgroup=mnvNormalArg contains=mnvBang
+syn region	mnvNormalArg	contained	start="\S" skip=+\n\s*\%(\\\|["#]\\ \)+ end="$" contains=@mnvContinue
+
+" Profile: {{{2
+" =======
+syn match	mnvProfileBang	 contained	"\a\@1<=!"	skipwhite nextgroup=mnvProfileArg
+syn keyword	mnvProfileArg	 contained	start	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	func	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	file	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	stop pause	skipwhite nextgroup=mnvCmdSep,@mnvComment
+syn keyword	mnvProfileArg	 contained	continue dump	skipwhite nextgroup=mnvCmdSep,@mnvComment
+" TODO: match file pattern
+syn region	mnvProfilePattern contained
+      \ start="\S"
+      \ skip=+\\[|"#]+
+      \ end="$" end=+\ze\s*[|"#]+
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvProfile	"\<prof\%[ile]\>"	skipwhite nextgroup=mnvProfileBang,mnvProfileArg
+
+syn keyword	mnvProfdelArg	contained	func	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfdelArg	contained	file	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfdelArg	contained	here	skipwhite nextgroup=mnvCmdSep,@mnvComment
+syn match	mnvProfdel	"\<profd\%[el]\>" skipwhite nextgroup=mnvProfdelArg
+
+" Prompt{find,repl}: {{{2
+" =================
+syn region	mnvPromptArg	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue
+syn keyword	mnvPrompt	promptf[ind] promptr[epl]	skipwhite nextgroup=mnvPromptArg
+
+" Redir: {{{2
+" =====
+syn match	mnvRedir		"\<redir\=\>"	skipwhite nextgroup=mnvRedirBang,mnvRedirFileOperator,mnvRedirVariableOperator,mnvRedirRegister,mnvRedirEnd
+syn match	mnvRedirBang	       contained	"\a\@1<=!"	skipwhite nextgroup=mnvRedirFileOperator
+
+syn match	mnvRedirFileOperator     contained	">>\="	skipwhite nextgroup=mnvRedirFile
+syn region	mnvRedirFile	       contained
+      \ start="\S"
+      \ matchgroup=Normal
+      \ end="\s*$"
+      \ end="\s*\ze[|"]"
+      \ nextgroup=mnvCmdSep,mnvComment
+      \ contains=mnvSpecFile
+syn match	mnvRedirRegisterOperator contained	">>\="
+syn match	mnvRedirRegister	       contained	"@[a-zA-Z*+"]"	nextgroup=mnvRedirRegisterOperator
+syn match	mnvRedirVariableOperator contained	"=>>\="	skipwhite nextgroup=mnvVar
+syn keyword	mnvRedirEnd	       contained	END
+
+" Sleep: {{{2
+" =====
+syn keyword	mnvSleep		sl[eep]		skipwhite nextgroup=mnvSleepBang,mnvSleepArg
+syn match	mnvSleepBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvSleepArg
+syn match	mnvSleepArg	contained	"\<\%(\d\+\)\=m\=\>"
+
+" Sort: {{{2
+" ====
+syn match	mnvSort		"\<sort\=\>"			skipwhite nextgroup=mnvSortBang,@mnvSortOptions,mnvSortPattern,mnvCmdSep
+syn match	mnvSortBang	  contained	"\a\@1<=!"			skipwhite nextgroup=@mnvSortOptions,mnvSortPattern,mnvCmdSep
+syn match	mnvSortOptionsError contained	"\a\+"
+syn match	mnvSortOptions	  contained	"\<[ilur]*[nfxob]\=[ilur]*\>"		skipwhite nextgroup=mnvSortPattern,mnvCmdSep
+syn region	mnvSortPattern	  contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:alpha:]|]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvSortOptions,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+
+syn cluster mnvSortOptions contains=mnvSortOptions,mnvSortOptionsError
+
+" Terminal: {{{2
+" ========
+syn match	mnvTerminal	"\<ter\%[minal]\>"		skipwhite        nextgroup=mnvTerminalOptions,mnvTerminalCommand
+syn match	mnvTerminal	+\<ter\%[minal]\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvTerminalOptions,mnvTerminalCommand,@mnvTerminalContinue
+
+syn match	mnvTerminalContinue	contained	"^\s*\\"       	skipwhite skipnl nextgroup=@mnvTerminalContinue,mnvTerminalOptions,mnvTerminalCommand contains=mnvWhitespace
+syn match         mnvTerminalContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@mnvTerminalContinue,mnvTerminalOptions,mnvTerminalCommand contains=mnvWhitespace
+syn cluster	mnvTerminalContinue	contains=mnvTerminalContinue,mnvTerminalContinueComment
+
+syn region	mnvTerminalCommand	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue
+
+syn region	mnvTerminalOptions	contained
+      \ start="++"
+      \ skip=/\s\+++\|\%(\n\|^\)\s*\%(\\\|["#]\\ \)/
+      \ end="\s"
+      \ end="$"
+      \ skipwhite nextgroup=mnvTerminalCommand
+      \ contains=@mnvContinue,mnvTerminalOption
+      \ transparent
+
+syn match	mnvTerminalOption	contained	"++\%(\%(no\)\=close\|open\|curwin\|hidden\|norestore\|shell\)\>"
+syn match	mnvTerminalOption	contained	"++kill="		nextgroup=mnvTerminalKillOptionArg
+syn match	mnvTerminalOption	contained	"++\%(rows\|cols\)="	nextgroup=mnvTerminalSizeOptionArg
+syn match	mnvTerminalOption	contained	"++eof="		nextgroup=mnvTerminalEofOptionArg
+syn match	mnvTerminalOption	contained	"++type="		nextgroup=mnvTerminalTypeOptionArg
+syn match	mnvTerminalOption	contained	"++api="		nextgroup=mnvTerminalApiOptionArg
+
+syn match	mnvTerminalApiOptionArg	contained	"\<\S\+\>"
+syn match	mnvTerminalEofOptionArg	contained	"\<\S\+\>"
+syn match	mnvTerminalSizeOptionArg	contained	"\<\d\+\>"
+syn keyword	mnvTerminalKillOptionArg	contained	term hup quit int kill
+syn match	mnvTerminalKillOptionArg	contained	"\<\d\+\>"
+syn keyword	mnvTerminalTypeOptionArg	contained	conpty winpty
+
+" Uniq: {{{2
+" ====
+syn match	mnvUniq		"\<uniq\=\>"	skipwhite nextgroup=mnvUniqBang,@mnvUniqOptions,mnvUniqPattern,mnvCmdSep
+syn match	mnvUniqBang	  contained	"\a\@1<=!"	skipwhite nextgroup=@mnvUniqOptions,mnvUniqPattern,mnvCmdSep
+syn match	mnvUniqOptionsError contained	"\a\+"
+syn match	mnvUniqOptions	  contained	"\<[ilur]*\>"	skipwhite nextgroup=mnvUniqPattern,mnvCmdSep
+syn region	mnvUniqPattern	  contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:alpha:]|]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvUniqOptions,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+
+syn cluster mnvUniqOptions contains=mnvUniqOptions,mnvUniqOptionsError
+
+" Wincmd: {{{2
+" ======
+syn match	mnvWincmd	"\<winc\%[md]\>"	skipwhite nextgroup=mnvWincmdArg
+" TODO: consider extracting this list from the help file
+syn match	mnvWincmdArg	contained
+      \ "\<[sSvnqojkhlwWtbpPrRxKJHLTfFz]\>\|[\^:=\-+_<>|\]}]\|\<g\s\+[\]}]\|\<g[fFtT]\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" only handles oneline assignments
+MNV9 syn match	mnvWincmd	"\s\=\<winc\%[md]\>\ze\s\+=\s*\%([#|]\|$\)"	skipwhite nextgroup=mnvWincmdArg
+
+" Syntax: {{{2
+"=======
+syn region	mnvGroupList	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      "\ need to consume the whitespace
+      \ end="\s"he=e-1
+      \ end="$"
+      \ contains=@mnvGroupListContinue,mnvGroupSpecial,mnvGroupListContinueComma
+syn keyword	mnvGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
+syn match	mnvGroupListComma		contained	","
+syn match	mnvGroupListContinueComma	contained	"\s\+,\s*\|,\s\+"	contains=mnvGroupListComma
+syn match	mnvGroupListContinueComma	contained	"\s*,\s*\%(\n\s*\%(\\\s\+\|["#]\\ .*\)\)\+"	contains=@mnvGroupListContinue,mnvGroupListComma
+
+syn match	mnvGroupListEquals	contained	"="		skipwhite skipnl nextgroup=mnvGroupListContinueStart,mnvGroupList
+" the first continuation line does not terminate the list at whitepace after \
+syn match	mnvGroupListContinueStart	contained	"^\%(\s*["#]\\ .*\n\)*\s*\\\s\+"	skipwhite        nextgroup=mnvGroupList contains=@mnvGroupListContinue transparent
+
+syn match	mnvGroupListContinue	contained	"^\s*\\"	skipwhite skipnl nextgroup=@mnvGroupListContinue,mnvGroupListContinueComma contains=mnvWhitespace
+syn match	mnvGroupListContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@mnvGroupListContinue		   contains=mnvWhitespace
+syn cluster	mnvGroupListContinue	contains=mnvGroupListContinue,mnvGroupListContinueComment
+
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynerror")
+ syn match	mnvSynError		contained	"\i\+"
+endif
+syn match	mnvSynContains		contained	"\<contains\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvSynContainedin		contained	"\<containedin\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvSynNextgroup		contained	"\<nextgroup\>"	skipwhite nextgroup=mnvGroupListEquals
+if has("conceal")
+ " no whitespace allowed after '='
+ syn match	mnvSynCchar	contained	"\<cchar="	nextgroup=mnvSynCcharValue
+ syn match	mnvSynCcharValue	contained	"\S"
+endif
+
+syn match	mnvSyntax	"\<sy\%[ntax]\>"	contains=mnvCommand skipwhite nextgroup=mnvSynType,@mnvComment
+syn cluster mnvFunctionBodyList add=mnvSyntax
+
+" Syntax: case {{{2
+syn keyword	mnvSynType	contained	case	skipwhite nextgroup=mnvSynCase,mnvSynCaseError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsyncaseerror")
+ syn match	mnvSynCaseError	contained	"\i\+"
+endif
+syn keyword	mnvSynCase	contained	ignore	match
+
+" Syntax: clear {{{2
+syn keyword	mnvSynType	contained	clear
+
+" Syntax: cluster {{{2
+syn keyword	mnvSynType	contained	cluster	skipwhite nextgroup=mnvClusterName
+syn region	mnvClusterName	contained keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="$\||" contains=@mnvContinue,mnvGroupAdd,mnvGroupRem,mnvSynContains,mnvSynError
+syn match	mnvGroupAdd	contained	"\<add\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvGroupRem	contained	"\<remove\>"	skipwhite nextgroup=mnvGroupListEquals
+
+" Syntax: conceal {{{2
+syn match	mnvSynType	contained	"\<conceal\>"	skipwhite nextgroup=mnvSynConceal,mnvSynConcealError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynconcealerror")
+ syn match	mnvSynConcealError contained	"\i\+"
+endif
+syn keyword	mnvSynConceal	contained	on	off
+
+" Syntax: foldlevel {{{2
+syn keyword	mnvSynType	contained	foldlevel	skipwhite nextgroup=mnvSynFoldlevel,mnvSynFoldlevelError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynfoldlevelerror")
+ syn match	mnvSynFoldlevelError	contained	"\i\+"
+endif
+syn keyword	mnvSynFoldlevel	contained	start	minimum
+
+" Syntax: iskeyword {{{2
+syn keyword	mnvSynType		contained	iskeyword	skipwhite nextgroup=mnvSynIskeyword
+syn keyword	mnvSynIskeyword		contained	clear
+syn match	mnvSynIskeyword		contained	"\S\+"	contains=mnvSynIskeywordSep
+syn match	mnvSynIskeywordSep	contained	","
+
+" Syntax: include {{{2
+syn keyword	mnvSynType		contained	include	skipwhite nextgroup=mnvSynIncludeCluster
+syn match	mnvSynIncludeCluster	contained	"@[_a-zA-Z0-9]\+\>"
+
+" Syntax: keyword {{{2
+syn cluster	mnvSynKeyGroup	contains=@mnvContinue,mnvSynCchar,mnvSynNextgroup,mnvSynKeyOpt,mnvSynContainedin
+syn keyword	mnvSynType	contained	keyword	skipwhite nextgroup=mnvSynKeyRegion
+syn region	mnvSynKeyRegion	contained         keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynKeyGroup
+syn match	mnvSynKeyOpt	contained	"\%#=1\<\%(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
+
+" Syntax: match {{{2
+syn cluster	mnvSynMtchGroup	contains=@mnvContinue,mnvSynCchar,mnvSynContains,mnvSynContainedin,mnvSynError,mnvSynMtchOpt,mnvSynNextgroup,mnvSynRegPat,mnvNotation,mnvMtchComment
+syn keyword	mnvSynType	contained	match	skipwhite nextgroup=mnvSynMatchRegion
+syn region	mnvSynMatchRegion	contained keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynMtchGroup
+syn match	mnvSynMtchOpt	contained	"\%#=1\<\%(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
+
+" Syntax: off and on {{{2
+syn keyword	mnvSynType	contained	enable	list	manual	off	on	reset
+
+" Syntax: region {{{2
+syn cluster	mnvSynRegPatGroup	contains=@mnvContinue,mnvPatSep,mnvNotPatSep,mnvSynPatRange,mnvSynNotPatRange,mnvSubstSubstr,mnvPatRegion,mnvPatSepErr,mnvNotation
+syn cluster	mnvSynRegGroup	contains=@mnvContinue,mnvSynCchar,mnvSynContains,mnvSynContainedin,mnvSynNextgroup,mnvSynRegOpt,mnvSynReg,mnvSynMtchGrp
+syn keyword	mnvSynType	contained	region	skipwhite nextgroup=mnvSynRegion
+syn region	mnvSynRegion	contained keepend	matchgroup=mnvGroupName start="\h\w*" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynRegGroup
+syn match	mnvSynRegOpt	contained	"\%#=1\<\%(conceal\%(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
+syn match	mnvSynReg	contained	"\<\%(start\|skip\|end\)="	nextgroup=mnvSynRegPat
+syn match	mnvSynMtchGrp	contained	"matchgroup="	nextgroup=mnvGroup,mnvHLGroup
+syn region	mnvSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip=/\\\\\|\\\z1\|\n\s*\%(\\\|"\\ \)/  end="\z1"  contains=@mnvSynRegPatGroup skipwhite nextgroup=mnvSynPatMod,mnvSynReg
+syn match	mnvSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\="
+syn match	mnvSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\=," nextgroup=mnvSynPatMod
+syn match	mnvSynPatMod	contained	"lc=\d\+"
+syn match	mnvSynPatMod	contained	"lc=\d\+," nextgroup=mnvSynPatMod
+syn region	mnvSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
+syn match	mnvSynNotPatRange	contained	"\\\\\|\\\["
+syn match	mnvMtchComment	contained	'"[^"]\+$'
+
+" Syntax: spell {{{2
+syn keyword	mnvSynType	contained	spell	skipwhite nextgroup=mnvSynSpell,mnvSynSpellError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynspellerror")
+ syn match	mnvSynSpellError contained	"\i\+"
+endif
+syn keyword	mnvSynSpell	contained	default	notoplevel	toplevel
+
+" Syntax: sync {{{2
+" ============
+syn keyword mnvSynType	contained	sync	skipwhite	nextgroup=mnvSyncClear,mnvSyncMatch,mnvSyncError,mnvSyncRegion,mnvSyncArgs
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsyncerror")
+ syn match	mnvSyncError	contained	"\i\+"
+endif
+
+syn region	mnvSyncArgs	contained	start="\S" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=mnvSyncLines,mnvSyncLinebreak,mnvSyncLinecont,mnvSyncFromstart,mnvSyncCcomment
+
+syn keyword	mnvSyncCcomment	contained	ccomment	skipwhite	nextgroup=mnvGroupName
+syn keyword	mnvSyncClear	contained	clear	skipwhite	nextgroup=mnvSyncGroupName
+syn keyword	mnvSyncFromstart	contained	fromstart
+syn keyword	mnvSyncMatch	contained	match	skipwhite	nextgroup=mnvSyncGroupName
+syn keyword	mnvSyncRegion	contained	region	skipwhite	nextgroup=mnvSynRegion
+syn match	mnvSyncLinebreak	contained	"\<linebreaks="		nextgroup=mnvNumber
+syn keyword	mnvSyncLinecont	contained	linecont	skipwhite	nextgroup=mnvSynRegPat
+syn match	mnvSyncLines	contained	"\<lines="		nextgroup=mnvNumber
+syn match	mnvSyncLines	contained	"\<minlines="		nextgroup=mnvNumber
+syn match	mnvSyncLines	contained	"\<maxlines="		nextgroup=mnvNumber
+syn match	mnvSyncGroupName	contained	"\<\h\w*\>"	skipwhite	nextgroup=mnvSyncKey
+syn match	mnvSyncKey	contained	"\<grouphere\>"	skipwhite	nextgroup=mnvSyncGroup
+syn match	mnvSyncKey	contained	"\<groupthere\>"	skipwhite	nextgroup=mnvSyncGroup
+syn match	mnvSyncGroup	contained	"\<\h\w*\>"	skipwhite	nextgroup=mnvSynRegPat,mnvSyncNone
+syn keyword	mnvSyncNone	contained	NONE
+
+" Syntime: {{{2
+" =======
+syn keyword	mnvSyntimeArg	contained	on off clear report	skipwhite nextgroup=mnvComment,mnv9Comment,mnvCmdSep
+syn keyword	mnvSyntime		synti[me]		skipwhite nextgroup=mnvSyntimeArg
+" Additional IsCommand: here by reasons of precedence {{{2
+" ====================
+syn match	mnvIsCommand	"<Bar>\s*\a\+"	transparent contains=mnvCommand,mnvNotation
+
+" Highlighting: {{{2
+" ============
+syn cluster	mnvHighlightCluster		contains=mnvHiLink,mnvHiClear,mnvHiKeyList,@mnvComment
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvhictermerror")
+ syn match	mnvHiCtermError	contained	"\D\i*"
+endif
+syn match	mnvHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=mnvHiBang,@mnvHighlightCluster
+syn match	mnvHiBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvHighlightCluster
+
+syn case ignore
+" Conceal is a generated low-priority match
+syn match	mnvHiGroup	contained	"\%(\<Conceal\>\)\@!\i\+"
+syn keyword	mnvHiNone	contained	NONE
+syn keyword	mnvHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl underdashed underdotted underdouble
+syn keyword	mnvFgBgAttrib	contained	none bg background fg foreground
+syn case match
+syn match	mnvHiAttribList	contained	"\i\+"	contains=mnvHiAttrib
+syn match	mnvHiAttribList	contained	"\i\+,"he=e-1	contains=mnvHiAttrib nextgroup=mnvHiAttribList
+syn case ignore
+syn keyword	mnvHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey grey40 grey50 grey90 lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred lightyellow magenta red seagreen white yellow
+syn match	mnvHiCtermColor	contained	"\<color\d\{1,3}\>"
+syn case match
+
+syn match	mnvHiFontname	contained	"[a-zA-Z\-*]\+"
+syn match	mnvHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
+syn match	mnvHiGuiRgb	contained	"#\x\{6}"
+
+" Highlighting: hi group key=arg ... {{{2
+syn cluster	mnvHiCluster contains=mnvGroup,mnvHLGroup,mnvHiGroup,mnvHiNone,mnvHiTerm,mnvHiCTerm,mnvHiStartStop,mnvHiCtermFgBg,mnvHiCtermul,mnvHiCtermfont,mnvHiGui,mnvHiGuiFont,mnvHiGuiFgBg,mnvHiKeyError,mnvNotation,mnvComment,mnv9comment
+syn region	mnvHiKeyList	contained 	start="\i\+" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|" excludenl end="$" contains=@mnvContinue,@mnvHiCluster
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_mnvhikeyerror")
+ syn match	mnvHiKeyError	contained	"\i\+="he=e-1
+endif
+syn match	mnvHiTerm	contained	"\cterm="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiStartStop	contained	"\c\%(start\|stop\)="he=e-1	nextgroup=mnvHiTermcap,mnvOption
+syn match	mnvHiCTerm	contained	"\ccterm="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiCtermul	contained	"\cctermul="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiCtermfont	contained	"\cctermfont="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiGui	contained	"\cgui="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiGuiFont	contained	"\cfont="he=e-1		nextgroup=mnvHiFontname
+syn match	mnvHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=mnvHiGroup,mnvHiGuiFontname,mnvHiGuiRgb,mnvFgBgAttrib
+syn match	mnvHiTermcap	contained	"\S\+"		contains=mnvNotation
+syn match	mnvHiNmbr	contained	'\d\+'
+
+" Highlight: clear {{{2
+syn keyword	mnvHiClear	contained	clear	skipwhite nextgroup=mnvGroup,mnvHLGroup,mnvHiGroup
+
+" Highlight: link {{{2
+" see tst24 (hi def vs hi) (Jul 06, 2018)
+"syn region	mnvHiLink	contained oneline matchgroup=mnvCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=mnvHiGroup,mnvGroup,mnvHLGroup,mnvNotation
+" TODO: simplify and allow line continuations --djk
+syn region	mnvHiLink	contained matchgroup=Type start="\%(\<hi\%[ghlight]!\=\s\+\)\@<=\%(\%(def\%[ault]\s\+\)\=link\>\|\<def\%[ault]\>\)" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|" excludenl end="$" contains=@mnvContinue,@mnvHiCluster
+
+" Control Characters: {{{2
+" ==================
+syn match	mnvCtrlChar	"[
--]"
+
+" Embedded Scripts:  {{{2
+" ================
+"   perl,ruby	: Benoit Cerrina
+"   python,tcl	: Johannes Zellner
+"   mzscheme, lua : Charles Campbell
+
+" Allows users to specify the type of embedded script highlighting
+" they want:  (lua/mzscheme/perl/python/ruby/tcl support)
+"   g:mnvsyn_embed == 0   : don't embed any scripts
+"   g:mnvsyn_embed =~# 'l' : embed Lua
+"   g:mnvsyn_embed =~# 'm' : embed MzScheme
+"   g:mnvsyn_embed =~# 'p' : embed Perl
+"   g:mnvsyn_embed =~# 'P' : embed Python
+"   g:mnvsyn_embed =~# 'r' : embed Ruby
+"   g:mnvsyn_embed =~# 't' : embed Tcl
+
+let s:interfaces = get(g:, "mnvsyn_embed", "lP")
+
+" [-- lua --] {{{3
+if s:interfaces =~# 'l'
+  syn include @mnvLuaScript syntax/lua.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvLua	lua	skipwhite nextgroup=mnvLuaHeredoc,mnvLuaStatement
+syn keyword	mnvLua	luado	skipwhite nextgroup=mnvLuaStatement
+syn keyword	mnvLua	luafile
+
+syn region	mnvLuaStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvLuaScript,@mnvContinue
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvLuaScript
+
+" [-- mzscheme --] {{{3
+if s:interfaces =~# 'm'
+  let s:iskKeep = &l:isk
+  syn include @mnvMzSchemeScript syntax/scheme.mnv
+  unlet b:current_syntax
+  let &l:isk = s:iskKeep
+endif
+
+syn keyword	mnvMzScheme	mz[scheme]	skipwhite nextgroup=mnvMzSchemeHeredoc,mnvMzSchemeStatement
+syn keyword	mnvMzScheme	mzf[ile]
+
+syn region	mnvMzSchemeStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvMzSchemeScript,@mnvContinue
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvMzSchemeScript
+
+" [-- perl --] {{{3
+if s:interfaces =~# 'p'
+  syn include @mnvPerlScript syntax/perl.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPerl	pe[rl]	skipwhite nextgroup=mnvPerlHeredoc,mnvPerlStatement
+syn keyword	mnvPerl	perld[o]	skipwhite nextgroup=mnvPerlStatement
+
+syn region	mnvPerlStatement	contained
+       \ start="\S"
+       \ skip=+\n\s*\%(\\\|["#]\\ \)+
+       \ end="$"
+       \ contains=@mnvPerlScript,@mnvContinue
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+<<\s*\z(\S\+\)\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1$+ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+<<\ze\s*$+	matchgroup=mnvScriptHeredocStop
+       \ end=+^\.$+
+       \ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1\=\z2$+
+       \ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1\=\.$+
+       \ contains=@mnvPerlScript
+
+" [-- python --] {{{3
+if s:interfaces =~# 'P'
+  syn include @mnvPythonScript syntax/python2.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPython	py[thon]	skipwhite nextgroup=mnvPythonHeredoc,mnvPythonStatement
+syn keyword	mnvPython	pydo	skipwhite nextgroup=mnvPythonStatement
+syn keyword	mnvPython	pyfile
+
+syn region	mnvPythonStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPythonScript,@mnvContinue
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPythonScript
+
+" [-- python3 --] {{{3
+if s:interfaces =~# 'P'
+  syn include @mnvPython3Script syntax/python.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPython3	python3 py3	skipwhite nextgroup=mnvPython3Heredoc,mnvPython3Statement
+syn keyword	mnvPython3	py3do	skipwhite nextgroup=mnvPython3Statement
+syn keyword	mnvPython3	py3file
+
+syn region	mnvPython3Statement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPython3Script,@mnvContinue
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPython3Script
+
+" [-- pythonx --] {{{3
+if s:interfaces =~# 'P'
+  if &pyxversion == 2
+    syn cluster mnvPythonXScript contains=@mnvPythonScript
+  else
+    syn cluster mnvPythonXScript contains=@mnvPython3Script
+  endif
+endif
+
+syn keyword	mnvPythonX	pythonx pyx	skipwhite nextgroup=mnvPythonXHeredoc,mnvPythonXStatement
+syn keyword	mnvPythonX	pyxdo	skipwhite nextgroup=mnvPythonXStatement
+syn keyword	mnvPythonX	pyxfile
+
+syn region	mnvPythonXStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPythonXScript,@mnvContinue
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPythonXScript
+
+" [-- ruby --] {{{3
+if s:interfaces =~# 'r'
+  syn include @mnvRubyScript syntax/ruby.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvRuby	rub[y]	skipwhite nextgroup=mnvRubyHeredoc,mnvRubyStatement
+syn keyword	mnvRuby	rubyd[o]	skipwhite nextgroup=mnvRubyStatement
+syn keyword	mnvRuby	rubyf[ile]
+
+syn region	mnvRubyStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvRubyScript,@mnvContinue
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+	matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\.$+
+      \ contains=@mnvRubyScript
+
+" [-- tcl --] {{{3
+if s:interfaces =~# 't'
+  syn include @mnvTclScript syntax/tcl.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvTcl	tcl	skipwhite nextgroup=mnvTclHeredoc,mnvTclStatement
+syn keyword	mnvTcl	tcld[o]	skipwhite nextgroup=mnvTclStatement
+syn keyword	mnvTcl	tclf[ile]
+syn region	mnvTclStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvTclScript,@mnvContinue
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvTclScript
+
+unlet s:interfaces
+" Function Call Highlighting: {{{2
+" (following Gautam Iyer's suggestion)
+" ==========================
+syn match	mnvFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=mnvOperParen		contains=mnvFuncName
+syn match	mnvUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=mnvOperParen,mnv9TypeArgs
+syn match	mnvUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnv9MethodName,mnv9Super,mnv9This
+syn match	mnvUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=mnvOperParen		contains=mnvVarScope
+syn match	mnvUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnvVarScope,mnvNotation
+
+MNV9 syn match	mnv9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnvVarScope,mnvNotation,mnv9MethodName,mnv9Super,mnv9This
+MNV9 syn match	mnv9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=mnvOperParen		contains=mnvFuncName
+
+syn cluster	mnvFunc	contains=mnvFunc,mnvUserFunc
+syn cluster	mnv9Func	contains=mnv9Func,mnv9UserFunc
+
+syn region	mnv9TypeArgs	contained
+      \ matchgroup=Delimiter
+      \ start="<\ze\a"
+      \ end=">"
+      \ nextgroup=mnvOperParen
+      \ contains=@mnvType
+      \ oneline
+
+" Beginners - Patterns that involve ^ {{{2
+" =========
+MNV9 syn region	mnv9LineComment	start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\%(\\\|#\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString,mnv9CommentTitle extend
+MNVL syn region	mnvLineComment	start=+^[ \t:]*\zs".*$+ skip=+\n\s*\%(\\\|"\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString,mnvCommentTitle extend
+
+syn match	mnvCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=mnvCommentTitleLeader,mnvTodo,@mnvCommentGroup
+syn match	mnv9CommentTitle	'#\s*\%([sS]:\|\h\w*#\)\=\%([A-DF-Z]\w*\|E\%(\d\{1,4}\>\)\@!\w*\)\(\s\+\u\w*\)*:'hs=s+1	contained contains=mnv9CommentTitleLeader,mnvTodo,@mnvCommentGroup
+
+" allowed anywhere in the file
+if !s:mnv9script
+  syn match	mnvShebangError	"^\s*\zs#!.*" display
+endif
+syn match	mnvShebang	"\%^#!.*" display
+
+syn match	mnvContinue		"^\s*\zs\\"
+syn match	mnvContinueComment	'^\s*\zs["#]\\ .*' extend
+syn match	mnv9ContinueComment	"^\s*\zs#\\ .*"	 extend
+syn cluster	mnvContinue	contains=mnvContinue,mnvContinueComment
+syn cluster	mnv9Continue	contains=mnvContinue,mnv9ContinueComment
+
+syn region	mnvString	start='^\s*\\"' end='"' oneline keepend contains=@mnvStringGroup,mnvContinue
+syn region	mnvString	start="^\s*\\'" end="'" oneline keepend contains=mnvQuoteEscape,mnvContinue
+
+syn match	mnvCommentTitleLeader	'"\s\+'ms=s+1	contained
+syn match	mnv9CommentTitleLeader	'#\s\+'ms=s+1	contained
+
+" Searches And Globals: {{{2
+" ====================
+MNVL syn match	mnvSearch	'^\s*[/?].*'		contains=mnvSearchDelim
+syn match	mnvSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
+MNV9 syn match	mnv9Search	'^\s*:[/?].*'		contains=mnv9SearchDelim
+syn match	mnv9SearchDelim	'^\s*\zs:[/?]\|[/?]$'	contained contains=mnvCmdSep
+syn region	mnvGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=mnvSubst1
+syn region	mnvGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=mnvSubst1
+
+" MNV9 script Regions: {{{2
+" ==================
+
+if s:mnv9script
+  syn cluster mnvLegacyTop	contains=TOP,mnv9LegacyHeader,mnv9Comment,mnv9LineComment
+  MNVFoldH syn region mnv9LegacyHeader start="\%^" end="^\ze\s*mnv9s\%[cript]\>" contains=@mnvLegacyTop,mnvComment,mnvLineComment
+
+  syn keyword mnv9MNV9ScriptArg	noclear contained
+  syn keyword mnv9MNV9Script	mnv9s[cript] nextgroup=mnv9MNV9ScriptArg skipwhite
+endif
+
+" Synchronize (speed) {{{2
+"============
+
+exe "syn sync minlines=" .. get(g:, "mnvsyn_minlines", 100)
+exe "syn sync maxlines=" .. get(g:, "mnvsyn_maxlines", 200)
+
+syn sync linecont	"^\s\+\\"
+syn sync linebreaks=2
+syn sync match mnvAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
+
+" ====================
+" Highlighting Settings {{{2
+" ====================
+
+if !exists("skip_mnv_syntax_inits")
+ if !exists("g:mnvsyn_noerror")
+  hi def link mnvBehaveError	mnvError
+  hi def link mnvCollClassErr	mnvError
+  hi def link mnvErrSetting	mnvError
+  hi def link mnvFTError	mnvError
+  hi def link mnvFunctionError	mnvError
+  hi def link mnvFunc         	mnvError
+  hi def link mnv9Func         	mnvError
+  hi def link mnvHiAttribList	mnvError
+  hi def link mnvHiCtermError	mnvError
+  hi def link mnvHiKeyError	mnvError
+  hi def link mnvMapModErr	mnvError
+  hi def link mnvMarkArgError	mnvError
+  hi def link mnvShebangError	mnvError
+  hi def link mnvSortOptionsError	Error
+  hi def link mnvSubstFlagErr	mnvError
+  hi def link mnvSynCaseError	mnvError
+  hi def link mnvSyncError	mnvError
+  hi def link mnvSynConcealError	mnvError
+  hi def link mnvSynError	mnvError
+  hi def link mnvSynFoldlevelError	mnvError
+  hi def link mnvSynIskeywordError	mnvError
+  hi def link mnvSynSpellError	mnvError
+  hi def link mnvBufnrWarn	mnvWarn
+
+  hi def link mnv9TypeAliasError	mnvError
+ endif
+
+ hi def link mnvAbb	mnvCommand
+ hi def link mnvAddress	mnvMark
+ hi def link mnvAt	mnvCommand
+ hi def link mnvAtArg	Special
+ hi def link mnvAugroupBang	mnvBang
+ hi def link mnvAugroupError	mnvError
+ hi def link mnvAugroupKey	mnvCommand
+ hi def link mnvAutocmd	mnvCommand
+ hi def link mnvAutocmdBang	mnvBang
+ hi def link mnvAutocmdPatternEscape	Special
+ hi def link mnvAutoEvent	Type
+ hi def link mnvAutoEventGlob	Type
+ hi def link mnvAutocmdBufferPattern	Special
+ hi def link mnvAutocmdMod	Special
+ hi def link mnvAutocmdPatternSep	mnvSep
+ hi def link mnvBang	mnvOper
+ hi def link mnvBehaveBang	mnvBang
+ hi def link mnvBehaveModel	mnvBehave
+ hi def link mnvBehave	mnvCommand
+ hi def link mnvBracket	Delimiter
+ hi def link mnvBreakaddFunc	Special
+ hi def link mnvBreakaddFile	Special
+ hi def link mnvBreakaddHere	Special
+ hi def link mnvBreakaddExpr	Special
+ hi def link mnvBreakpointGlob	Special
+ hi def link mnvBreakadd	mnvCommand
+ hi def link mnvBreakdel	mnvCommand
+ hi def link mnvBreaklist	mnvCommand
+ hi def link mnvCall	mnvCommand
+ hi def link mnvCatch	mnvCommand
+ hi def link mnvCd	mnvCommand
+ hi def link mnvCdBang	mnvBang
+ hi def link mnvCmplxRepeat	SpecialChar
+ hi def link mnvCommand	Statement
+ hi def link mnvCommandModifier	mnvCommand
+ hi def link mnvCommandModifierBang	mnvBang
+ hi def link mnvComment	Comment
+ hi def link mnvCommentError	mnvError
+ hi def link mnvCommentString	mnvString
+ hi def link mnvCommentTitle	PreProc
+ hi def link mnvCondHL	mnvCommand
+ hi def link mnvConst	mnvCommand
+ hi def link mnvContinue	Special
+ hi def link mnvContinueComment	mnvComment
+ hi def link mnvContinueString	mnvString
+ hi def link mnvCount	Number
+ hi def link mnvCtrlChar	SpecialChar
+ hi def link mnvDebug	mnvCommand
+ hi def link mnvDebuggreedy	mnvCommand
+ hi def link mnvDef	mnvCommand
+ hi def link mnvDefBang	mnvBang
+ hi def link mnvDefComment	mnv9Comment
+ hi def link mnvDefer	mnvCommand
+ hi def link mnvDefParam	mnvVar
+ hi def link mnvDelcommand	mnvCommand
+ hi def link mnvDelcommandAttr	mnvUserCmdAttr
+ hi def link mnvDelfunction	mnvCommand
+ hi def link mnvDelfunctionBang	mnvBang
+ hi def link mnvDoautocmd	mnvCommand
+ hi def link mnvDoautocmdMod	Special
+ hi def link mnvDoCommand	mnvCommand
+ hi def link mnvDoCommandBang	mnvBang
+ hi def link mnvEcho	mnvCommand
+ hi def link mnvEchohlNone	mnvGroup
+ hi def link mnvEchohl	mnvCommand
+ hi def link mnvElse	mnvCommand
+ hi def link mnvElseIfErr	Error
+ hi def link mnvEndfunction	mnvCommand
+ hi def link mnvEnddef	mnvCommand
+ hi def link mnvEndif	mnvCommand
+ hi def link mnvEnvvar	PreProc
+ hi def link mnvError	Error
+ hi def link mnvEscape	Special
+ hi def link mnvEval	mnvCommand
+ hi def link mnvExFilter	mnvCommand
+ hi def link mnvExFilterBang	mnvBang
+ hi def link mnvExMark	mnvCommand
+ hi def link mnvFBVar	mnvVar
+ hi def link mnvFgBgAttrib	mnvHiAttrib
+ hi def link mnvFuncEcho	mnvCommand
+ hi def link mnvFor	mnvCommand
+ hi def link mnvForInContinue	mnvContinue
+ hi def link mnvForInContinueComment	mnvContinueComment
+ hi def link mnvFTCmd	mnvCommand
+ hi def link mnvFTOption	mnvSynType
+ hi def link mnvFunction	mnvCommand
+ hi def link mnvFunctionBang	mnvBang
+ hi def link mnvFunctionComment	mnvComment
+ hi def link mnvFuncName	Function
+ hi def link mnvFunctionMod	Special
+ hi def link mnvFunctionParam	mnvVar
+ hi def link mnvFunctionParamEquals	mnvOper
+ hi def link mnvFunctionScope	mnvVarScope
+ hi def link mnvFunctionSID	mnvNotation
+ hi def link mnvGrep	mnvCommand
+ hi def link mnvGrepadd	mnvCommand
+ hi def link mnvGrepBang	mnvBang
+ hi def link mnvGroup	Type
+ hi def link mnvGroupAdd	mnvSynOption
+ hi def link mnvGroupListEquals	mnvSynOption
+ hi def link mnvGroupListContinue		mnvContinue
+ hi def link mnvGroupListContinueComment	mnvContinueComment
+ hi def link mnvGroupName	Normal
+ hi def link mnvGroupRem	mnvSynOption
+ hi def link mnvGroupSpecial	Special
+ hi def link mnvHelp	mnvCommand
+ hi def link mnvHelpBang	mnvBang
+ hi def link mnvHelpgrep	mnvCommand
+ hi def link mnvHiAttrib	PreProc
+ hi def link mnvHiBang	mnvBang
+ hi def link mnvHiClear	Type
+ hi def link mnvHiCtermColor	Constant
+ hi def link mnvHiCtermFgBg	mnvHiTerm
+ hi def link mnvHiCtermfont	mnvHiTerm
+ hi def link mnvHiCtermul	mnvHiTerm
+ hi def link mnvHiCTerm	mnvHiTerm
+ hi def link mnvHighlight	mnvCommand
+ hi def link mnvHiGroup	mnvGroupName
+ hi def link mnvHiGuiFgBg	mnvHiTerm
+ hi def link mnvHiGuiFont	mnvHiTerm
+ hi def link mnvHiGuiRgb	mnvNumber
+ hi def link mnvHiGui	mnvHiTerm
+ hi def link mnvHiNmbr	Number
+ hi def link mnvHiNone	mnvGroup
+ hi def link mnvHiStartStop	mnvHiTerm
+ hi def link mnvHiTerm	Type
+ hi def link mnvHLGroup	mnvGroup
+ hi def link mnvHistory	mnvCommand
+ hi def link mnvHistoryName	Special
+ hi def link mnvImport	mnvCommand
+ hi def link mnvImportAutoload	Special
+ hi def link mnvImportAs	mnvImport
+ hi def link mnvInsert	mnvString
+ hi def link mnv9KeymapLineComment	mnvKeymapLineComment
+ hi def link mnvKeymapLineComment	mnvComment
+ hi def link mnvKeymapTailComment	mnvComment
+ hi def link mnvLambdaBrace	Delimiter
+ hi def link mnvLambdaOperator	mnvOper
+ hi def link mnvLanguage	mnvCommand
+ hi def link mnvLanguageCategory	Special
+ hi def link mnvLanguageNameReserved	Constant
+ hi def link mnvLet	mnvCommand
+ hi def link mnvLetHeredoc	mnvString
+ hi def link mnvLetHeredocStart	Special
+ hi def link mnvLetHeredocStop	Special
+ hi def link mnvLetRegister	mnvRegister
+ hi def link mnvLineComment	mnvComment
+ hi def link mnvLua	mnvCommand
+ hi def link mnvMake	mnvCommand
+ hi def link mnvMakeadd	mnvCommand
+ hi def link mnvMakeBang	mnvBang
+ hi def link mnvMapBang	mnvBang
+ hi def link mnvMapLeader	mnvBracket
+ hi def link mnvMapLeaderKey	mnvNotation
+ hi def link mnvMapModKey	mnvFunctionSID
+ hi def link mnvMapMod	mnvBracket
+ hi def link mnvMap	mnvCommand
+ hi def link mnvMark	Number
+ hi def link mnvMarkNumber	mnvNumber
+ hi def link mnvMatch	mnvCommand
+ hi def link mnvMatchGroup	mnvGroup
+ hi def link mnvMatchNone	mnvGroup
+ hi def link mnvMenuBang	mnvBang
+ hi def link mnvMenuClear	Special
+ hi def link mnvMenuMod	mnvMapMod
+ hi def link mnvMenuName	PreProc
+ hi def link mnvMenu	mnvCommand
+ hi def link mnvMenuNotation	mnvNotation
+ hi def link mnvMenuPriority	Number
+ hi def link mnvMenuStatus	Special
+ hi def link mnvMenutranslateComment	mnvComment
+ hi def link mnv9MethodName	mnvFuncName
+ hi def link mnvMtchComment	mnvComment
+ hi def link mnvMzScheme	mnvCommand
+ hi def link mnvNonText	NonText
+ hi def link mnvNormal	mnvCommand
+ hi def link mnvNotation	Special
+ hi def link mnvNotFunc	mnvCommand
+ hi def link mnvNotPatSep	mnvString
+ hi def link mnvNumber	Number
+ hi def link mnvOperError	Error
+ hi def link mnvOper	Operator
+ hi def link mnvOperContinue	mnvContinue
+ hi def link mnvOperContinueComment	mnvContinueComment
+ hi def link mnvOption	PreProc
+ hi def link mnvOptionVar	Identifier
+ hi def link mnvOptionVarName	Identifier
+ hi def link mnvParenSep	Delimiter
+ hi def link mnvPatSepErr	mnvError
+ hi def link mnvPatSepR	mnvPatSep
+ hi def link mnvPatSep	SpecialChar
+ hi def link mnvPatSepZone	mnvString
+ hi def link mnvPatSepZ	mnvPatSep
+ hi def link mnvPattern	Type
+ hi def link mnvPerl	mnvCommand
+ hi def link mnvPlainMark	mnvMark
+ hi def link mnvProfile	mnvCommand
+ hi def link mnvProfileArg	mnvSpecial
+ hi def link mnvProfileBang	mnvBang
+ hi def link mnvProfdel	mnvCommand
+ hi def link mnvProfdelArg	mnvSpecial
+ hi def link mnvPrompt	mnvCommand
+ hi def link mnvPython	mnvCommand
+ hi def link mnvPython3	mnvCommand
+ hi def link mnvPythonX	mnvCommand
+ hi def link mnvQuoteEscape	mnvEscape
+ hi def link mnvRedir	mnvCommand
+ hi def link mnvRedirBang	mnvBang
+ hi def link mnvRedirFileOperator	mnvOper
+ hi def link mnvRedirRegisterOperator	mnvOper
+ hi def link mnvRedirVariableOperator	mnvOper
+ hi def link mnvRedirEnd	Special
+ hi def link mnvRedirRegister	mnvRegister
+ hi def link mnvRegister	SpecialChar
+ hi def link mnvRuby	mnvCommand
+ hi def link mnvScriptDelim	Comment
+ hi def link mnvScriptHeredocStart	mnvLetHeredocStart
+ hi def link mnvScriptHeredocStop	mnvLetHeredocStop
+ hi def link mnvSearch	mnvString
+ hi def link mnvSearchDelim	Delimiter
+ hi def link mnvSep	Delimiter
+ hi def link mnvSet	mnvCommand
+ hi def link mnvSetAll	mnvOption
+ hi def link mnvSetBang	mnvBang
+ hi def link mnvSetComment	mnvComment
+ hi def link mnvSetMod	mnvOption
+ hi def link mnvSetSep	mnvSep
+ hi def link mnvSetTermcap	mnvOption
+ hi def link mnvShebang	PreProc
+ hi def link mnvSleep	mnvCommand
+ hi def link mnvSleepArg	Constant
+ hi def link mnvSleepBang	mnvBang
+ hi def link mnvSort	mnvCommand
+ hi def link mnvSortBang	mnvBang
+ hi def link mnvSortOptions	Special
+ hi def link mnvSpecFile	Identifier
+ hi def link mnvSpecFileMod	mnvSpecFile
+ hi def link mnvSpecial	Type
+ hi def link mnvStringCont	mnvString
+ hi def link mnvString	String
+ hi def link mnvStringEnd	mnvString
+ hi def link mnvStringInterpolationBrace	mnvEscape
+ hi def link mnvSubst1	mnvSubst
+ hi def link mnvSubstCount	Number
+ hi def link mnvSubstDelim	Delimiter
+ hi def link mnvSubstFlags	Special
+ hi def link mnvSubstSubstr	SpecialChar
+ hi def link mnvSubstTwoBS	mnvString
+ hi def link mnvSubst	mnvCommand
+ hi def link mnvSynCase	Type
+ hi def link mnvSyncCcomment	Type
+ hi def link mnvSynCchar	mnvSynOption
+ hi def link mnvSynCcharValue	Character
+ hi def link mnvSyncClear	Type
+ hi def link mnvSyncFromstart	Type
+ hi def link mnvSyncGroup	mnvGroupName
+ hi def link mnvSyncGroupName	mnvGroupName
+ hi def link mnvSyncKey	Type
+ hi def link mnvSyncLinebreak	Type
+ hi def link mnvSyncLinecont	Type
+ hi def link mnvSyncLines	Type
+ hi def link mnvSyncMatch	Type
+ hi def link mnvSyncNone	Type
+ hi def link mnvSynConceal	Type
+ hi def link mnvSynContains	mnvSynOption
+ hi def link mnvSyncRegion	Type
+ hi def link mnvSynFoldlevel	Type
+ hi def link mnvSynIskeyword	Type
+ hi def link mnvSynIskeywordSep	Delimiter
+ hi def link mnvSynContainedin	mnvSynContains
+ hi def link mnvSynKeyOpt	mnvSynOption
+ hi def link mnvSynMtchGrp	mnvSynOption
+ hi def link mnvSynMtchOpt	mnvSynOption
+ hi def link mnvSynNextgroup	mnvSynOption
+ hi def link mnvSynNotPatRange	mnvSynRegPat
+ hi def link mnvSynOption	Special
+ hi def link mnvSynPatRange	mnvString
+ hi def link mnvSynReg	Type
+ hi def link mnvSynRegOpt	mnvSynOption
+ hi def link mnvSynRegPat	mnvString
+ hi def link mnvSynSpell	Type
+ hi def link mnvSyntax	mnvCommand
+ hi def link mnvSynType	mnvSpecial
+ hi def link mnvSyntime	mnvCommand
+ hi def link mnvSyntimeArg	mnvSpecial
+ hi def link mnvTcl	mnvCommand
+ hi def link mnvTerminal	mnvCommand
+ hi def link mnvTerminalContinue	mnvContinue
+ hi def link mnvTerminalContinueComment	mnvContinueComment
+ hi def link mnvTerminalOption		mnvSpecial
+ hi def link mnvTerminalKillOptionArg	Constant
+ hi def link mnvTerminalSizeOptionArg	Constant
+ hi def link mnvTerminalTypeOptionArg	Constant
+ hi def link mnvThrow	mnvCommand
+ hi def link mnvTodo	Todo
+ hi def link mnvType	Type
+ hi def link mnvTypeAny	mnvType
+ hi def link mnvTypeObject	mnvType
+ hi def link mnvTypeObjectBracket	mnvTypeObject
+ hi def link mnvUniq	mnvCommand
+ hi def link mnvUniqBang	mnvBang
+ hi def link mnvUniqOptions	Special
+ hi def link mnvUnlet	mnvCommand
+ hi def link mnvUnletBang	mnvBang
+ hi def link mnvUnmap	mnvMap
+ hi def link mnvUserCmd	mnvCommand
+ hi def link mnvUserCmdAttrAddr	mnvSpecial
+ hi def link mnvUserCmdAttrComplete	mnvSpecial
+ hi def link mnvUserCmdAttrCompleteFunc	mnvVar
+ hi def link mnvUserCmdAttrNargs	mnvSpecial
+ hi def link mnvUserCmdAttrRange	mnvSpecial
+ hi def link mnvUserCmdAttrKey	mnvUserCmdAttr
+ hi def link mnvUserCmdAttr	Special
+ hi def link mnvUserCmdAttrError	Error
+ hi def link mnvUserCmdError	Error
+ hi def link mnvUserCmdKey	mnvCommand
+ hi def link mnvUserFunc	Normal
+ hi def link mnvVar	Normal
+ hi def link mnvVarScope	Identifier
+ hi def link mnvMNVgrep	mnvCommand
+ hi def link mnvMNVgrepadd	mnvCommand
+ hi def link mnvMNVgrepBang	mnvBang
+ hi def link mnvMNVgrepFlags	Special
+ hi def link mnvMNVVar	Identifier
+ hi def link mnvMNVVarName	Identifier
+ hi def link mnvWarn	WarningMsg
+ hi def link mnvWildcard	Special
+ hi def link mnvWildcardBraceComma	mnvWildcard
+ hi def link mnvWildcardBracket	mnvWildcard
+ hi def link mnvWildcardBracketCaret	mnvWildcard
+ hi def link mnvWildcardBracketCharacter	Normal
+ hi def link mnvWildcardBracketCharacter	Normal
+ hi def link mnvWildcardBracketCharacterClass	mnvWildCard
+ hi def link mnvWildcardBracketCollatingSymbol	mnvWildCard
+ hi def link mnvWildcardBracketEnd		mnvWildcard
+ hi def link mnvWildcardBracketEquivalenceClass	mnvWildCard
+ hi def link mnvWildcardBracketEscape	mnvWildcard
+ hi def link mnvWildcardBracketHyphen	mnvWildcard
+ hi def link mnvWildcardBracketRightBracket	mnvWildcardBracketCharacter
+ hi def link mnvWildcardBracketStart	mnvWildcard
+ hi def link mnvWildcardEscape	mnvWildcard
+ hi def link mnvWildcardInterval	mnvWildcard
+ hi def link mnvWildcardQuestion	mnvWildcard
+ hi def link mnvWildcardStar	mnvWildcard
+ hi def link mnvWinCmd	mnvCommand
+
+ hi def link mnv9Abstract	mnvCommand
+ hi def link mnv9Boolean	Boolean
+ hi def link mnv9Class	mnvCommand
+ hi def link mnv9Comment	Comment
+ hi def link mnv9CommentError	mnvError
+ hi def link mnv9CommentTitle	PreProc
+ hi def link mnv9ConstructorDefParam	mnvVar
+ hi def link mnv9Const	mnvCommand
+ hi def link mnv9ContinueComment	mnvContinueComment
+ hi def link mnv9Enum	mnvCommand
+ hi def link mnv9EnumImplementedInterfaceComment	mnv9Comment
+ hi def link mnv9EnumImplements	mnv9Implements
+ hi def link mnv9EnumNameComment	mnv9Comment
+ hi def link mnv9EnumNameContinue	mnvContinue
+ hi def link mnv9EnumNameContinueComment	mnv9Comment
+ hi def link mnv9EnumValueListCommaComment	mnv9Comment
+ hi def link mnv9Export	mnvCommand
+ hi def link mnv9Extends	Keyword
+ hi def link mnv9Final	mnvCommand
+ hi def link mnv9For	mnvCommand
+ hi def link mnv9ForInComment	mnv9Comment
+ hi def link mnv9Implements	Keyword
+ hi def link mnv9AbstractDef	mnvCommand
+ hi def link mnv9Interface	mnvCommand
+ hi def link mnv9LambdaOperator	mnvOper
+ hi def link mnv9LambdaOperatorComment	mnv9Comment
+ hi def link mnv9LambdaParen	mnvParenSep
+ hi def link mnv9LhsRegister	mnvLetRegister
+ hi def link mnv9LhsVariable	mnvVar
+ hi def link mnv9LineComment	mnvComment
+ hi def link mnv9MethodDef	mnvCommand
+ hi def link mnv9MethodDefComment	mnvDefComment
+ hi def link mnv9MethodNameError	mnvFunctionError
+ hi def link mnv9Null	Constant
+ hi def link mnv9Public	mnvCommand
+ hi def link mnv9Search	mnvString
+ hi def link mnv9SearchDelim	Delimiter
+ hi def link mnv9Static	mnvCommand
+ hi def link mnv9Super	Identifier
+ hi def link mnv9This	Identifier
+ hi def link mnv9Type	mnvCommand
+ hi def link mnv9TypeEquals	mnvOper
+ hi def link mnv9Variable	mnvVar
+ hi def link mnv9VariableType	mnvType
+ hi def link mnv9VariableTypeAny	mnvTypeAny
+ hi def link mnv9VariableTypeObject	mnvTypeObject
+ hi def link mnv9VariableTypeObjectBracket	mnvTypeObjectBracket
+ hi def link mnv9Var	mnvCommand
+ hi def link mnv9MNV9ScriptArg	Special
+ hi def link mnv9MNV9Script	mnvCommand
+
+ hi def link mnvCompilerSet	mnvCommand
+ hi def link mnvSynColor mnvCommand
+ hi def link mnvSynLink mnvCommand
+ hi def link mnvSynMenu	mnvCommand
+ hi def link mnvSynMenuPath	mnvMenuName
+endif
+
+" Current Syntax Variable: {{{2
+let b:current_syntax = "mnv"
+
+" ---------------------------------------------------------------------
+" Cleanup: {{{1
+delc MNV9
+delc MNVL
+delc MNVFolda
+delc MNVFoldc
+delc MNVFolde
+delc MNVFoldf
+delc MNVFoldh
+delc MNVFoldH
+delc MNVFoldi
+delc MNVFoldl
+delc MNVFoldm
+delc MNVFoldp
+delc MNVFoldP
+delc MNVFoldr
+delc MNVFoldt
+let &cpo = s:keepcpo
+unlet s:keepcpo s:mnv9script
+" mnv:ts=18 fdm=marker ft=mnv
diff --git a/uvim/runtime/syntax/generator/update_date.vim b/uvim/runtime/syntax/generator/update_date.mnv
index bb4c2073bb..cfcc85124f 100644
--- a/uvim/runtime/syntax/generator/update_date.vim
+++ b/uvim/runtime/syntax/generator/update_date.mnv
@@ -1,4 +1,4 @@
-" Update the date of following line in vim.vim.rc.
+" Update the date of following line in mnv.mnv.rc.
 "     '" Last Change:  '
 "
 language C
@@ -10,4 +10,4 @@ if lnum > 0
    silent update
 endif
 quitall!
-" vim:ts=4 sw=4 et
+" mnv:ts=4 sw=4 et
diff --git a/uvim/runtime/syntax/generator/vim.vim.base b/uvim/runtime/syntax/generator/vim.vim.base
deleted file mode 100644
index d73688927a..0000000000
--- a/uvim/runtime/syntax/generator/vim.vim.base
+++ /dev/null
@@ -1,2868 +0,0 @@
-" Vim syntax file
-" Language:	   Vim script
-" Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
-"	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2026 Feb 20
-" Former Maintainer: Charles E. Campbell
-
-" DO NOT CHANGE DIRECTLY.
-" THIS FILE PARTLY GENERATED BY gen_syntax_vim.vim.
-" (Search string "GEN_SYN_VIM:" in this file)
-
-" Quit when a syntax file was already loaded {{{1
-if exists("b:current_syntax")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Feature testing {{{1
-
-" NOTE: vimsyn_force_vim9 for internal use only
-let s:vim9script = get(b:, "vimsyn_force_vim9", v:false) || "\n" .. getline(1, 32)->join("\n") =~# '\n\s*vim9\%[script]\>'
-
-function s:has(feature)
-  return has(a:feature) || index(get(g:, "vimsyn_vim_features", []), a:feature) != -1
-endfunction
-
-" Automatically generated keyword lists: {{{1
-
-" vimTodo: contains common special-notices for comments {{{2
-" Use the vimCommentGroup cluster to add your own.
-syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
-syn cluster vimCommentGroup	contains=vimTodo,@Spell
-
-" regular vim commands {{{2
-" GEN_SYN_VIM: vimCommand normal, START_STR='syn keyword vimCommand contained', END_STR='nextgroup=vimBang'
-
-" Lower priority :syn-match to allow for :command/function() distinction
-" :chdir is handled specially elsewhere
-syn match vimCommand "\<co\%[py]\>"     nextgroup=vimBang
-syn match vimCommand "\<d\%[elete]\>"   nextgroup=vimBang
-syn match vimCommand "\<j\%[oin]\>"     nextgroup=vimBang
-syn match vimCommand "\<sp\%[lit]\>"    nextgroup=vimBang
-syn match vimCommand "\<sw\%[apname]\>" nextgroup=vimBang
-
-" GEN_SYN_VIM: vimCommand modifier, START_STR='syn keyword vimCommandModifier', END_STR='skipwhite nextgroup=vimCommandModifierBang,@vimCmdList'
-" :filter is handled specially elsewhere
-syn match	vimCommandModifierBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimCmdList
-
-" Lower priority :syn-match to allow for :command/function() distinction
-syn match vimCommand "\<bro\%[wse]\>"  skipwhite nextgroup=vimCommandModifierBang,@vimCmdList
-syn match vimCommand "\<conf\%[irm]\>" skipwhite nextgroup=vimCommandModifierBang,@vimCmdList
-
-" Lower priority for _new_ to distinguish constructors from the command.
-syn match   vimCommand contained	"\<new\>(\@!"
-syn match   vimCommand contained	"\<z[-+^.=]\=\>"
-syn keyword vimStdPlugin contained	Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man Over Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Until Winbar XMLent XMLns
-
-" vimOptions are caught only when contained in a vimSet {{{2
-" GEN_SYN_VIM: vimOption normal, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod'
-
-" vimOptions: These are the turn-off setting variants {{{2
-" GEN_SYN_VIM: vimOption turn-off, START_STR='syn keyword vimOption contained', END_STR=''
-
-" vimOptions: These are the invertible variants {{{2
-" GEN_SYN_VIM: vimOption invertible, START_STR='syn keyword vimOption contained', END_STR=''
-" termcap codes (which can also be set) {{{2
-" GEN_SYN_VIM: vimOption term output code, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod'
-" term key codes
-syn keyword vimOption contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
-syn match   vimOption contained	"t_%1"
-syn match   vimOption contained	"t_#2"
-syn match   vimOption contained	"t_#4"
-syn match   vimOption contained	"t_@7"
-syn match   vimOption contained	"t_*7"
-syn match   vimOption contained	"t_&8"
-syn match   vimOption contained	"t_%i"
-syn match   vimOption contained	"t_k;"
-
-" vimOptions: These are the variable names {{{2
-" GEN_SYN_VIM: vimOption normal variable,           START_STR='syn keyword vimOptionVarName contained', END_STR=''
-" GEN_SYN_VIM: vimOption term output code variable, START_STR='syn keyword vimOptionVarName contained', END_STR=''
-syn keyword vimOptionVarName contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
-syn match   vimOptionVarName contained	"t_%1"
-syn match   vimOptionVarName contained	"t_#2"
-syn match   vimOptionVarName contained	"t_#4"
-syn match   vimOptionVarName contained	"t_@7"
-syn match   vimOptionVarName contained	"t_*7"
-syn match   vimOptionVarName contained	"t_&8"
-syn match   vimOptionVarName contained	"t_%i"
-syn match   vimOptionVarName contained	"t_k;"
-
-" unsupported settings: some were supported by vi but don't do anything in vim {{{2
-" GEN_SYN_VIM: Missing vimOption, START_STR='syn keyword vimErrSetting contained', END_STR=''
-
-" AutoCmd Events {{{2
-syn case ignore
-" GEN_SYN_VIM: vimAutoEvent, START_STR='syn keyword vimAutoEvent contained', END_STR='skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern'
-
-syn keyword	vimAutoEvent	contained	User	skipwhite nextgroup=vimUserAutoEvent
-syn match	vimUserAutoEvent	contained	"\<\h\w*\>"	skipwhite nextgroup=vimUserAutoEventSep,vimAutocmdMod,vimAutocmdBlock
-
-" Highlight commonly used Groupnames {{{2
-" GEN_SYN_VIM: vimGroup, START_STR='syn keyword vimGroup contained', END_STR=''
-
-" Default highlighting groups {{{2
-" GEN_SYN_VIM: vimHLGroup, START_STR='syn keyword vimHLGroup contained', END_STR=''
-syn match vimHLGroup contained "\<Conceal\>"
-syn case match
-
-" Function Names {{{2
-" GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained', END_STR=''
-
-" Predefined variable names {{{2
-" GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR=''
-
-"--- syntax here and above generated by runtime/syntax/generator/gen_syntax_vim.vim ---
-
-" Special Vim Highlighting (not automatic) {{{1
-
-" Neovim keyword list additions {{{2
-
-if s:has("nvim")
-  syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
-  syn keyword vimFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
-  syn match   vimFuncName      contained "\<nvim_\w\+\>"
-  syn keyword vimVimVarName    contained lua msgpack_types relnum stderr termrequest virtnum
-endif
-
-" Set up commands for this syntax highlighting file {{{2
-
-com! -nargs=* Vim9 execute <q-args> s:vim9script ? "" : "contained"
-com! -nargs=* VimL execute <q-args> s:vim9script ? "contained" : ""
-
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[acefhiHlmpPrt]'
- if g:vimsyn_folding =~# 'a'
-  com! -nargs=* VimFolda <args> fold
- else
-  com! -nargs=* VimFolda <args>
- endif
- if g:vimsyn_folding =~# 'c'
-  com! -nargs=* VimFoldc <args> fold
- else
-  com! -nargs=* VimFoldc <args>
- endif
- if g:vimsyn_folding =~# 'e'
-  com! -nargs=* VimFolde <args> fold
- else
-  com! -nargs=* VimFolde <args>
- endif
- if g:vimsyn_folding =~# 'f'
-  com! -nargs=* VimFoldf <args> fold
- else
-  com! -nargs=* VimFoldf <args>
- endif
- if g:vimsyn_folding =~# 'h'
-  com! -nargs=* VimFoldh <args> fold
- else
-  com! -nargs=* VimFoldh <args>
- endif
- if g:vimsyn_folding =~# 'H'
-  com! -nargs=* VimFoldH <args> fold
- else
-  com! -nargs=* VimFoldH <args>
- endif
- if g:vimsyn_folding =~# 'i'
-  com! -nargs=* VimFoldi <args> fold
- else
-  com! -nargs=* VimFoldi <args>
- endif
- if g:vimsyn_folding =~# 'l'
-  com! -nargs=* VimFoldl <args> fold
- else
-  com! -nargs=* VimFoldl <args>
- endif
- if g:vimsyn_folding =~# 'm'
-  com! -nargs=* VimFoldm <args> fold
- else
-  com! -nargs=* VimFoldm <args>
- endif
- if g:vimsyn_folding =~# 'p'
-  com! -nargs=* VimFoldp <args> fold
- else
-  com! -nargs=* VimFoldp <args>
- endif
- if g:vimsyn_folding =~# 'P'
-  com! -nargs=* VimFoldP <args> fold
- else
-  com! -nargs=* VimFoldP <args>
- endif
- if g:vimsyn_folding =~# 'r'
-  com! -nargs=* VimFoldr <args> fold
- else
-  com! -nargs=* VimFoldr <args>
- endif
- if g:vimsyn_folding =~# 't'
-  com! -nargs=* VimFoldt <args> fold
- else
-  com! -nargs=* VimFoldt <args>
- endif
-else
- com! -nargs=*	VimFolda	<args>
- com! -nargs=*	VimFoldc	<args>
- com! -nargs=*	VimFolde	<args>
- com! -nargs=*	VimFoldf	<args>
- com! -nargs=*	VimFoldi	<args>
- com! -nargs=*	VimFoldh	<args>
- com! -nargs=*	VimFoldH	<args>
- com! -nargs=*	VimFoldl	<args>
- com! -nargs=*	VimFoldm	<args>
- com! -nargs=*	VimFoldp	<args>
- com! -nargs=*	VimFoldP	<args>
- com! -nargs=*	VimFoldr	<args>
- com! -nargs=*	VimFoldt	<args>
-endif
-
-" Deprecated variable options {{{2
-if exists("g:vim_minlines")
- let g:vimsyn_minlines= g:vim_minlines
-endif
-if exists("g:vim_maxlines")
- let g:vimsyn_maxlines= g:vim_maxlines
-endif
-if exists("g:vimsyntax_noerror")
- let g:vimsyn_noerror= g:vimsyntax_noerror
-endif
-
-" Nulls {{{2
-" =====
-Vim9 syn keyword  vim9Null	null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string null_tuple
-
-" Booleans {{{2
-" ========
-Vim9 syn keyword vim9Boolean	true false
-
-" Numbers {{{2
-" =======
-syn case ignore
-syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
-syn match	vimNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@vimComment
-syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	'\<0z\>'			skipwhite nextgroup=@vimComment
-syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscript
-syn case match
-
-" All vimCommands are contained by vimIsCommand. {{{2
-syn cluster vimCmdList	contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelp,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLanguage,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl
-syn cluster vim9CmdList	contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
-syn match vimCmdSep	"\\\@1<!|"	skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
-syn match vimCmdSep	":\+"	skipwhite nextgroup=@vimCmdList,vimSubst1
-syn match vimCount	contained	"\d\+"
-syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
-syn match vimBang	      contained	"!"
-syn match vimWhitespace contained	"\s\+"
-
-syn region vimSubscript contained	matchgroup=vimSubscriptBracket start="\[" end="]" nextgroup=vimSubscript contains=@vimExprList
-
-syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vim9Super,vim9This
-syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-
-" match the scope prefix independently of the retrofitted scope dictionary
-syn match vimVarScope   contained	"\<[bwglstav]:"
-syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscript
-
-syn match vimVarNameError contained "\<\h\w*\>"
-syn match vimVimVar	"\<v:"		nextgroup=vimSubscript,vimVimVarName,vimVarNameError
-syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscript,vimOptionVarName,vimVarNameError
-syn cluster vimSpecialVar	contains=vimEnvvar,vimLetRegister,vimOptionVar,vimVimVar
-
-Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
-
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
-Vim9 syn match	vim9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=vimLetHeredoc	contains=vimVarScope
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscript
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimOper	contains=vim9Super,vim9This
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=vim9Super,vim9This
-
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=vimVar,@vimSpecialVar
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+=<<"	skipwhite nextgroup=vimLetHeredoc	contains=vimVar,@vimSpecialVar
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+\.\.="			contains=vimVar,@vimSpecialVar
-
-Vim9 syn match vim9LhsRegister	"@["0-9\-a-zA-Z#=*+_/]\ze\s\+\%(\.\.\)\=="
-
-syn cluster vimExprList	contains=@vimSpecialVar,@vimFunc,vimNumber,vimOper,vimOperParen,vimLambda,vimString,vimVar,@vim9ExprList
-syn cluster vim9ExprList	contains=vim9Boolean,vim9LambdaParams,vim9Null
-
-" Insertions And Appends: insert append {{{2
-"   (buftype != nofile test avoids having append, change, insert show up in the command window)
-" =======================
-if &buftype != 'nofile'
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=vimCommand end="^\.$" extend
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=vimCommand end="^\.$" extend
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=vimCommand end="^\.$" extend
-endif
-
-" Behave! {{{2
-" =======
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nobehaveerror")
- syn match   vimBehaveError contained	"[^ ]\+"
-endif
-syn match   vimBehave	"\<be\%[have]\>"	nextgroup=vimBehaveBang,vimBehaveModel,vimBehaveError skipwhite
-syn match   vimBehaveBang	contained	"\a\@1<=!" nextgroup=vimBehaveModel skipwhite
-syn keyword vimBehaveModel	contained	mswin	xterm
-
-" Break* commands {{{2
-" ===============
-syn keyword	vimBreakaddFunc	contained	func	skipwhite nextgroup=vimBreakpointFunctionLine,vimBreakpointFunction
-syn keyword	vimBreakaddFile	contained	file	skipwhite nextgroup=vimBreakpointFileLine,vimBreakpointFilename
-syn keyword	vimBreakaddHere	contained	here	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn keyword	vimBreakaddExpr	contained	expr	skipwhite nextgroup=@vimExprList
-
-syn match	vimBreakpointGlob		contained	"*"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointNumber	contained	"\<\d\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-
-syn cluster vimBreakpointArg contains=vimBreakaddFunc,vimBreakaddFile,vimBreakaddHere,vimBreakaddExpr
-
-syn match	vimBreakpointFunction	contained	"\<\%(\*\|\w\)\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointFilename	contained	"\<\%(\*\|\f\)\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointFunctionLine	contained	"\<\d\+\>"		skipwhite nextgroup=vimBreakpointFunction
-syn match	vimBreakpointFileLine	contained	"\<\d\+\>"		skipwhite nextgroup=vimBreakpointFilename
-
-syn keyword	vimBreakadd	breaka[dd]	skipwhite nextgroup=@vimBreakpointArg
-syn keyword	vimBreakdel	breakd[el]	skipwhite nextgroup=@vimBreakpointArg,vimBreakpointNumber,vimBreakpointGlob
-syn keyword	vimBreaklist	breakl[ist]	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-
-" Call {{{2
-" ====
-syn match vimCall	"\<call\=\>"	skipwhite nextgroup=vimVar,@vimFunc
-
-" Cd: {{{2
-" ==
-" GEN_SYN_VIM: vimCommand cd, START_STR='syn keyword vimCd', END_STR='skipwhite nextgroup=vimCdBang,vimCdArg,vimComment,vim9Comment,vimCmdSep'
-syn match	vimCd	"\<chd\%[ir]\>"	skipwhite nextgroup=vimCdBang,vimCdArg,vimComment,vim9Comment,vimCmdSep
-syn region	vimCdArg	contained
-      \ start=+["#|]\@!\S+
-      \ end="\ze\s*$"
-      \ end=+\ze\s*\\\@1<!["#|]+
-      \ skipwhite nextgroup=vimComment,vim9Comment,vimCmdSep
-      \ contains=vimSpecfile,@vimWildCard
-      \ oneline
-
-syn match	vimCdBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimCdArg,vimComment,vim9Comment,vimCmdSep
-
-" Debug {{{2
-" =====
-syn keyword	vimDebug	deb[ug]	skipwhite nextgroup=@vimCmdList
-
-" Debuggreedy {{{2
-" ===========
-" TODO: special-cased until generalised range/count support is implemented
-syn match	vimDebuggreedy	"\<0\=debugg\%[reedy]\>" contains=vimCount
-
-" Defer {{{2
-" =====
-syn match	vimDefer	"\<defer\=\>"	skipwhite nextgroup=@vimFunc,vim9LambdaParams
-
-" *Do commands {{{2
-" ============
-syn match	vimDoCommandBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimCmdList
-
-syn keyword	vimDoCommand	argdo bufd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	tabd[o] wind[o]		skipwhite nextgroup=@vimCmdList
-syn keyword	vimDoCommand	cdo cfd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	ld[o] lfd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	foldd[oopen] folddoc[losed]	skipwhite nextgroup=@vimCmdList
-
-" Exception Handling {{{2
-syn keyword	vimThrow	th[row]	skipwhite nextgroup=@vimExprList
-syn keyword	vimCatch	cat[ch]	skipwhite nextgroup=vimCatchPattern
-syn region	vimCatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@vimSubstList oneline
-
-" Export {{{2
-" ======
-if s:vim9script
-  syn keyword	vim9Export	export	skipwhite nextgroup=vim9Abstract,vim9ClassBody,vim9Const,vim9Def,vim9EnumBody,vim9Final,vim9InterfaceBody,vim9Type,vim9Var
-endif
-
-" Filetypes {{{2
-" =========
-syn match   vimFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=vimFTCmd,vimFTOption,vimFTError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimFTError")
- syn match   vimFTError  contained	"\I\i*"
-endif
-syn keyword vimFTCmd    contained	filet[ype]
-syn keyword vimFTOption contained	detect indent off on plugin
-
-" History {{{2
-" =======
-" TODO: handle Vim9 "history" variable assignment (like :wincmd, but a common variable name)
-syn keyword	vimHistory	his[tory]	skipwhite nextgroup=vimHistoryName,vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn keyword	vimHistoryName	contained	c[md] s[earch] e[xpr] i[nput] d[ebug] a[ll]	skipwhite nextgroup=vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryName	contained	"[:/?=@>]"			skipwhite nextgroup=vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	"-\=\<\d\+\>\%(\s*,\)\="		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	",\s*-\=\d\+\>"			skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	"-\=\<\d\+\s*,\s*-\=\d\+\>"		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" Import {{{2
-" ======
-syn keyword	vimImportAutoload	contained	autoload	skipwhite nextgroup=vimImportFilename
-if s:vim9script
-  syn region	vimImportFilename contained
-        \ start="\S"
-        \ skip=+\%#=1
-          "\ continuation operators at SOL
-          \\n\%(\s*#.*\n\)*\s*\%([[:punct:]]\+\&[^#"'(]\)
-            \\|
-          "\ continuation operators at EOL
-          \\%(\%([[:punct:]]\+\&[^#"')]\)\s*\%(#.*\)\=\)\@<=$
-            \\|
-          \\n\%(\s*#.*\n\)*\s*as\s
-            \\|
-          \\%(^\s*#.*\)\@<=$
-            \\|
-          \\n\s*\%(\\\|#\\ \)
-        \+
-        \ matchgroup=vimCommand
-        \ end="\s\+\zsas\ze\s\+\h"
-        \ matchgroup=NONE
-        \ end="$"
-        \ skipwhite nextgroup=vimImportName
-        \ contains=@vim9Continue,@vimExprList,vim9Comment
-        \ transparent
-else
-  syn region	vimImportFilename contained
-        \ start="\S"
-        \ skip=+\n\s*\%(\\\|"\\ \)+
-        \ matchgroup=vimCommand
-        \ end="\s\+\zsas\ze\s\+\h"
-        \ matchgroup=NONE
-        \ end="$"
-        \ skipwhite nextgroup=vimImportName
-        \ contains=@vimContinue,@vimExprList
-        \ transparent
-endif
-syn match	vimImportName	contained	"\%(\<as\s\+\)\@<=\h\w*\>"	skipwhite nextgroup=@vimComment
-syn match	vimImport		"\<imp\%[ort]\>"		skipwhite nextgroup=vimImportAutoload,vimImportFilename
-
-" Language {{{2
-" ========
-syn keyword 	vimLanguage		lan[guage]	skipwhite nextgroup=@vimLanguageName,vimLanguageCategory,vimSep,vimComment,vim9Comment
-syn keyword	vimLanguageCategory	contained	col[late] cty[pe] mes[sages] tim[e]	skipwhite nextgroup=@vimLanguageName
-
-" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX"
-syn match	vimLanguageName		contained	"[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]"	nextgroup=vimSep,vimComment,vim9Comment
-syn keyword	vimLanguageNameReserved	contained	C POSIX			nextgroup=vimSep,vimComment,vim9Comment
-syn cluster	vimLanguageName	contains=vimLanguageName,vimLanguageNameReserved
-
-" Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
-" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
-syn cluster vimAugroupList	contains=@vimCmdList,vimFilter,@vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue
-
-" define
-VimFolda syn region vimAugroup
-      \ start="\<aug\%[roup]\>\ze\s\+\%([eE][nN][dD]\%($\|[[:space:]|"#]\)\)\@!\S"
-      \ matchgroup=vimAugroupKey
-      \ end="\<aug\%[roup]\ze\s\+[eE][nN][dD]\s*\%($\|[|"#]\)"
-      \ skipwhite nextgroup=vimAugroupEnd
-      \ contains=vimAutocmd,@vimAugroupList,vimAugroupkey
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noaugrouperror")
-  syn match	vimAugroupError	"\<aug\%[roup]\s\+[eE][nN][dD]\ze\s*\%($\|[|"#]\)"
-endif
-
-" TODO: Vim9 comment
-syn match	vimAugroupName	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+"
-      \                                                                 skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimAugroupEnd	contained	"\c\<END\>"	skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimAugroupBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimAugroupName
-syn keyword	vimAugroupKey	contained	aug[roup] 	skipwhite nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd
-
-" remove
-syn match	vimAugroup	"\<aug\%[roup]!"		skipwhite nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
-
-" list
-VimL syn match	vimAugroup	"\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"	skipwhite nextgroup=vimCmdSep,vimComment  contains=vimAugroupKey
-Vim9 syn match 	vimAugroup	"\<aug\%[roup]\>\ze\s*\%([#|]\|$\)"	skipwhite nextgroup=vimCmdSep,vim9Comment contains=vimAugroupKey
-
-" Operators: {{{2
-" =========
-syn cluster	vimOperGroup	contains=@vimContinue,@vimExprList,vim9Comment,vim9LineComment,vimContinueString
-syn match	vimOper	"\a\@<!!"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimSpecFile
-syn match	vimOper	"||\|&&\|[-+*/%.]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimSpecFile
-syn match	vimOper	"?"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-" distinguish ternary : from ex-colon
-syn match	vimOper	"\s\@1<=:\ze\s\|\s\@1<=:$"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-syn match	vimOper	"??"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-syn match	vimOper	"="			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscript
-syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
- syn match	vimOperError	")"
-endif
-
-syn match	vimOperContinue		contained	"^\s*\\"        skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList contains=vimWhitespace
-syn match         vimOperContinueComment	contained	'^\s*["#]\\ .*' skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList contains=vimWhitespace
-syn cluster	vimOperContinue		contains=vimOperContinue,vimOperContinueComment
-
-" Lambda Expressions: {{{2
-" ==================
-syn match	vimLambdaOperator	contained	"->" skipwhite nextgroup=@vimExprList
-syn region	vimLambda	contained
-      \ matchgroup=vimLambdaBrace
-      \ start=+{\ze[[:space:][:alnum:]_.,]*\%(\n\s*\%(\\[[:space:][:alnum:]_.,]*\|"\\ .*\)\)*->+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="}" end="$"
-      \ contains=@vimContinue,@vimExprList,vimLambdaParams
-syn match	vimLambdaParams	contained	"\%({\n\=\)\@1<=\_.\{-}\%(->\)\@=" nextgroup=vimLambdaOperator contains=@vimContinue,vimFunctionParam
-
-syn match	vim9LambdaOperator   contained	"=>" skipwhite skipempty nextgroup=@vimExprList,vim9LambdaBlock,vim9LambdaOperatorComment
-syn match	vim9LambdaParen      contained	"[()]"
-syn match	vim9LambdaParams	   contained
-      \ "(\%(\<func(\|[^(]\)*\%(\n\s*\\\%(\<func(\|[^(]\)*\|\n\s*#\\ .*\)*\ze\s\+=>"
-      \ skipwhite nextgroup=vim9LambdaOperator
-      \ contains=@vim9Continue,vimDefParam,vim9LambdaParen,vim9LambdaReturnType
-syn region	vim9LambdaReturnType contained	start=")\@<=:\s" end="\ze\s*#" end="\ze\s*=>" contains=@vim9Continue,@vimType transparent
-syn region	vim9LambdaBlock	   contained	matchgroup=vimSep start="{" end="^\s*\zs}" contains=@vimDefBodyList
-
-syn match	vim9LambdaOperatorComment contained "#.*" skipwhite skipempty nextgroup=@vimExprList,vim9LambdaBlock,vim9LambdaOperatorComment
-
-" Functions: Tag is provided for those who wish to highlight tagged functions {{{2
-" =========
-syn cluster	vimFunctionBodyCommon	contains=@vimCmdList,vimCmplxRepeat,vimContinue,vimCtrlChar,vimDef,vimFBVar,vimFunction,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegister,vimSpecFile,vimString,vimSubst,vimFunctionFold,vimDefFold,vimCmdSep
-syn cluster	vimFunctionBodyList	contains=@vimFunctionBodyCommon,vimComment,vimLineComment,vimInsert,vimConst,vimLet,vimSearch
-syn cluster	vimDefBodyList		contains=@vimFunctionBodyCommon,vim9Comment,vim9LineComment,vim9Block,vim9Const,vim9Final,vim9Var,vim9Null,vim9Boolean,vim9For,vim9LhsVariable,vim9LhsVariableList,vim9LhsRegister,vim9Search,@vimSpecialVar,@vim9Func
-
-syn region	vimFunctionPattern	contained
-      \ matchgroup=vimOper
-      \ start="/"
-      \ end="$"
-      \ contains=@vimSubstList
-
-syn match	vimFunctionBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimFunctionName
-syn match	vimDefBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimDefName
-syn match	vimFunctionSID	contained	"\c<sid>"
-syn match	vimFunctionScope	contained	"\<[bwglstav]:"
-syn match	vimFunctionName	contained
-      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
-      \ skipwhite nextgroup=vimFunctionParams,vimCmdSep,vimComment,vim9Comment
-      \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag
-syn match	vimDefName	contained
-      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
-      \ nextgroup=vimDefTypeParams,vimDefParams,vimCmdSep,vimComment,vim9Comment
-      \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag
-
-syn match	vimFunction	"\<fu\%[nction]\>"	skipwhite nextgroup=vimFunctionBang,vimFunctionName,vimFunctionPattern,vimCmdSep,vimComment
-syn match	vimDef	"\<def\>"		skipwhite nextgroup=vimDefBang,vimDefName,vimFunctionPattern,vimCmdSep,vimComment
-
-syn region	vimFunctionComment	contained
-      \ start=+".*+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="$"
-      \ skipwhite skipempty nextgroup=vimFunctionBody,vimEndfunction
-syn region	vimDefComment	contained
-      \ start="#.*"
-      \ skip=+\n\s*\%(\\\|#\\ \)+
-      \ end="$"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimEnddef
-
-syn region	vimFunctionParams	contained
-      \ matchgroup=Delimiter
-      \ start="("
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end=")"
-      \ skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError
-      \ contains=vimFunctionParam,vimOperParen,@vimContinue
-syn region	vimDefParams	contained
-      \ matchgroup=Delimiter
-      \ start="("
-      \ end=")"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimReturnType,vimCommentError
-      \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals,vimOperParen
-syn region	vimDefTypeParams	contained
-      \ matchgroup=Delimiter
-      \ start="<"
-      \ end=">"
-      \ nextgroup=vimDefParams
-      \ contains=vim9DefTypeParam
-syn match	vimFunctionParam	contained	"\<\h\w*\>\|\.\.\."	skipwhite nextgroup=vimFunctionParamEquals
-syn match	vimDefParam	contained	"\<\h\w*\>"		skipwhite nextgroup=vimParamType,vimFunctionParamEquals
-syn match	vim9DefTypeParam	contained	"\<\u\w*\>"
-
-syn match	vimFunctionParamEquals contained	"="			skipwhite	  nextgroup=@vimExprList
-syn match	vimFunctionMod	     contained	"\<\%(abort\|closure\|dict\|range\)\>"	skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError
-
-syn region	vimFunctionBody	contained
-      \ start="^."
-      \ matchgroup=vimCommand
-      \ end="\<endfu\%[nction]\>"
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9CommentError
-      \ contains=@vimFunctionBodyList
-syn region	vimDefBody	contained
-      \ start="^."
-      \ matchgroup=vimCommand
-      \ end="\<enddef\>"
-      \ skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-      \ contains=@vimDefBodyList
-
-syn match	vimEndfunction	"\<endf\%[unction]\>"	skipwhite nextgroup=vimCmdSep,vimComment,vim9CommentError
-syn match	vimEnddef	"\<enddef\>"		skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
-  syn region	vimFunctionFold
-        \ start="\<fu\%[nction]!"
-        "\ assume no dict literal in curly-brace name expressions
-        \ start="\<fu\%[nction]\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+\s*("
-        \ end="^\s*:\=\s*endf\%[unction]\>"
-        \ contains=vimFunction
-        \ extend fold keepend transparent
-  syn region	vimDefFold
-        \ start="\<def!"
-        "\ assume no dict literal in curly-brace name expressions
-        \ start="\<def\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+[<(]"
-        \ end="^\s*:\=\s*enddef\>"
-        \ contains=vimDef
-        \ extend fold keepend transparent
-endif
-
-syn match	vimDelfunctionBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimFunctionName
-syn match	vimDelfunction			"\<delf\%[unction]\>"	skipwhite nextgroup=vimDelfunctionBang,vimFunctionName
-
-" Types: {{{2
-" =====
-
-syn region	vimReturnType	contained
-      \ start=":\%(\s\|\n\)\@="
-      \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
-      \ end="$"
-      \ matchgroup=vim9Comment
-      "\ allow for legacy script tail comment error
-      \ end="\ze[#"]"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimCommentError
-      \ contains=@vim9Continue,@vimType
-      \ transparent
-syn match	vimParamType	contained	":\s"	skipwhite skipnl nextgroup=@vimType contains=vimTypeSep
-
-syn match	vimTypeSep	contained	":\%(\s\|\n\)\@=" skipwhite nextgroup=@vimType
-syn keyword	vimType	contained	blob bool channel float job number string void
-syn keyword	vimTypeAny	contained	any
-syn match	vimTypeObject	contained	"\<object<\@="	nextgroup=vimTypeObjectArgs
-syn region	vimTypeObjectArgs	contained
-      \ matchgroup=vimTypeObjectBracket
-      \ start="<"
-      \ end=">"
-      \ contains=vimTypeAny,vimTypeObject,vimUserType
-      \ oneline
-      \ transparent
-syn match	vimType	contained	"\<\%(func\)\>"
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<func("	          end=")" nextgroup=vimTypeSep contains=@vim9Continue,@vimType transparent
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<tuple<"           end=">"                      contains=@vim9Continue,@vimType transparent
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<\%(list\|dict\)<" end=">"		   contains=@vimType oneline       transparent
-syn match	vimUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"
-
-syn cluster vimType contains=vimType,vimTypeAny,vimTypeObject,vimCompoundType,vimUserType
-
-" Classes, Enums And Interfaces: {{{2
-" =============================
-
-if s:vim9script
-
-  " Methods {{{3
-  syn match	vim9MethodDef		contained	"\<def\>"	skipwhite nextgroup=vim9MethodDefName,vim9ConstructorDefName
-  syn match	vim9MethodDefName		contained	"\<\h\w*\>"	nextgroup=vim9MethodDefParams,vim9MethodDefTypeParams contains=@vim9MethodName
-  syn region	vim9MethodDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vim9MethodDefReturnType,vimCommentError
-        \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9MethodDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9MethodDefParams
-        \ contains=vim9DefTypeParam
-
-  syn match	vim9ConstructorDefName	contained	"\<_\=new\w*\>"
-        \ nextgroup=vim9ConstructorDefParams,vim9ConstuctorDefTypeParams
-        \ contains=@vim9MethodName
-  syn match	vim9ConstructorDefParam	contained	"\<\%(this\.\)\=\h\w*\>"
-        \ skipwhite nextgroup=vimParamType,vimFunctionParamEquals
-        \ contains=vim9This,vimOper
-  syn region	vim9ConstructorDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError
-        \ contains=vim9ConstructorDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9ConstuctorDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9ConstructorDefParams
-        \ contains=vim9DefTypeParam
-
-  syn region	vim9MethodDefReturnType	contained
-        \ start=":\%(\s\|\n\)\@="
-        \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
-        \ end="$"
-        \ matchgroup=vim9Comment
-        \ end="\ze#"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError
-        \ contains=@vim9Continue,vimType,vimTypeSep
-        \ transparent
-
-  syn region	vim9MethodDefComment	contained
-        \ start="#.*"
-        \ skip=+\n\s*\%(\\\|#\\ \)+
-        \ end="$"
-        \ skipwhite skipempty nextgroup=vim9MethodDefBody,vimEnddef
-
-  syn region	vim9MethodDefBody		contained
-        \ start="^.\=" matchgroup=vimCommand end="\<enddef\>"
-        \ skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-        \ contains=@vim9MethodDefBodyList
-
-  syn cluster	vim9MethodDefBodyList contains=@vimDefBodyList,vim9This,vim9Super
-
-  if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
-    syn match	vim9MethodNameError contained	"\<[a-z0-9]\i\>"
-  endif
-  syn match	vim9MethodName	contained	"\<_\=new\w*\>"
-  syn keyword	vim9MethodName	contained	empty len string
-
-  syn cluster	vim9MethodName	contains=vim9MethodName,vim9MethodNameError
-
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
-    syn region	vim9MethodDefFold	contained
-          \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]"
-          \ end="^\s*:\=enddef\>"
-          \ contains=vim9MethodDef
-          \ fold keepend extend transparent
-  endif
-
-  syn cluster vim9MethodDef contains=vim9MethodDef,vim9MethodDefFold
-
-  " Classes {{{3
-  syn cluster	vim9ClassBodyList		contains=vim9Abstract,vim9Class,vim9Comment,vim9LineComment,@vim9Continue,@vimExprList,vim9Extends,vim9Implements,@vim9MethodDef,vim9Public,vim9Static,vim9Const,vim9Final,vim9This,vim9Super,vim9Var
-
-  syn match	vim9Class		contained	"\<class\>"	skipwhite        nextgroup=vim9ClassName
-  syn match	vim9ClassName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Extends,vim9Implements
-  syn match	vim9SuperClass		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Implements
-  syn match	vim9ImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9InterfaceListComma,vim9Extends
-  syn match	vim9InterfaceListComma	contained	","	skipwhite skipnl nextgroup=vim9ImplementedInterface
-  syn keyword	vim9Abstract			abstract	skipwhite skipnl nextgroup=vim9ClassBody,vim9AbstractDef
-  syn keyword	vim9Extends		contained	extends	skipwhite skipnl nextgroup=vim9SuperClass
-  syn keyword	vim9Implements		contained	implements	skipwhite skipnl nextgroup=vim9ImplementedInterface
-  syn keyword	vim9Public		contained	public
-  syn keyword	vim9Static		contained	static
-  " FIXME: don't match as dictionary keys, remove when operators are not
-  "        shared between Vim9 and legacy script
-  syn match	vim9This		contained	"\.\@1<!\<this\>:\@!"
-  " super must be followed by '.'
-  syn match	vim9Super		contained	"\.\@1<!\<super\.\@="
-
-  VimFoldc syn region	vim9ClassBody	start="\<class\>" matchgroup=vimCommand end="\<endclass\>" contains=@vim9ClassBodyList transparent
-
-  " Enums {{{3
-  syn cluster	vim9EnumBodyList		contains=vim9Comment,vim9LineComment,@vim9Continue,vim9Enum,@vimExprList,@vim9MethodDef,vim9Public,vim9Static,vim9Const,vim9Final,vim9This,vim9Var
-
-  syn match	vim9Enum		contained	"\<enum\>"	skipwhite           nextgroup=vim9EnumName
-
-  syn match	vim9EnumName		contained	"\<\u\w*\>"	skipwhite skipempty nextgroup=vim9EnumNameTrailing,vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue,vim9EnumImplements
-  syn match	vim9EnumNameTrailing	contained	"\S.*"
-  syn region	vim9EnumNameComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumNameComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-  " vim9EnumName's "skipempty" should only apply to comments and enum values and not implements clauses
-  syn match	vim9EnumNameEmpty		contained	"^"	skipwhite skipempty nextgroup=vim9EnumNameComment,vim9EnumValue
-  " allow line continuation between enum name and "implements"
-  syn match	vim9EnumNameContinue	contained
-        \ "^\s*\\"
-        \ skipwhite skipnl nextgroup=vim9EnumNameTrailing,vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue,vim9EnumImplements
-        \ contains=vimWhitespace
-  syn match	vim9EnumNameContinueComment	contained
-        \ "^\s*#\\ .*"
-        \ skipwhite skipnl nextgroup=vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue
-        \ contains=vimWhitespace
-  syn cluster	vim9EnumNameContinue	contains=vim9EnumNameContinue,vim9EnumNameContinueComment
-
-  " enforce enum value list location
-  syn match	vim9EnumValue		contained	"\<\a\w*\>"		  nextgroup=vim9EnumValueTypeArgs,vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment
-  syn match	vim9EnumValueListComma	contained	","	skipwhite skipempty nextgroup=vim9EnumValue,vim9EnumValueListCommaComment
-  syn region	vim9EnumValueListCommaComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumValueListCommaComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-  syn region	vim9EnumValueTypeArgs	contained
-        \ matchgroup=Delimiter
-        \ start="<\ze\a"
-        \ end=">"
-        \ nextgroup=vim9EnumValueArgList
-        \ contains=@vimType
-        \ oneline
-  syn region	vim9EnumValueArgList	contained
-        \ matchgroup=vimParenSep start="(" end=")"
-        \ nextgroup=vim9EnumValueListComma
-        \ contains=@vimExprList,vimContinueString,vim9Comment
-
-  syn keyword	vim9EnumImplements	contained	implements	skipwhite        nextgroup=vim9EnumImplementedInterface
-  syn match	vim9EnumImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9EnumInterfaceListComma,vim9EnumImplementedInterfaceComment,vim9EnumValue
-  syn match	vim9EnumInterfaceListComma	contained	","	skipwhite        nextgroup=vim9EnumImplementedInterface
-  syn region	vim9EnumImplementedInterfaceComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumImplementedInterfaceComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-
-  VimFolde syn region	vim9EnumBody	start="\<enum\>" matchgroup=vimCommand end="\<endenum\>" contains=@vim9EnumBodyList transparent
-
-  " Interfaces {{{3
-  " TODO: limit to decl only - no init values
-  syn cluster	vim9InterfaceBodyList	contains=vim9Comment,vim9LineComment,@vim9Continue,vim9Extends,vim9Interface,vim9AbstractDef,vim9Var
-
-  syn match	vim9Interface		contained	"\<interface\>"	skipwhite nextgroup=vim9InterfaceName
-  syn match	vim9InterfaceName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Extends
-
-  syn keyword	vim9AbstractDef		contained	def	skipwhite nextgroup=vim9AbstractDefName
-  syn match	vim9AbstractDefName	contained	"\<\h\w*\>"	skipwhite nextgroup=vim9AbstractDefParams,vim9AbstractDefTypeParams contains=@vim9MethodName
-  syn region	vim9AbstractDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vimDefComment,vim9AbstractDefReturnType,vimCommentError
-        \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9AbstractDefReturnType	contained
-        \ start=":\s" end="$" matchgroup=vim9Comment end="\ze[#"]"
-        \ skipwhite skipnl nextgroup=vimDefComment,vimCommentError
-        \ contains=vimTypeSep
-        \ transparent
-  syn region	vim9AbstractDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9AbstractDefParams
-        \ contains=vim9DefTypeParam
-
-  VimFoldi syn region	vim9InterfaceBody	start="\<interface\>" matchgroup=vimCommand end="\<endinterface\>" contains=@vim9InterfaceBodyList transparent
-
-  " Type Aliases {{{3
-  syn match	vim9Type		"\<ty\%[pe]\>"	skipwhite nextgroup=vim9TypeAlias,vim9TypeAliasError
-  syn match	vim9TypeAlias	 contained	"\<\u\w*\>"	skipwhite nextgroup=vim9TypeEquals
-  syn match	vim9TypeEquals	 contained	"="	skipwhite nextgroup=@vimType
-  if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_notypealiaserror")
-    syn match	vim9TypeAliasError contained	"\<\l\w*\>"	skipwhite nextgroup=vim9TypeEquals
-  endif
-endif
-
-" Blocks: {{{2
-" ======
-Vim9 syn region	vim9Block
-      \ matchgroup=vimSep
-      \ start="{\ze\s*\%($\|[#|]\)"
-      \ end="^\s*\zs}"
-      \ skipwhite nextgroup=vim9Comment,vimCmdSep
-      \ contains=@vimDefBodyList
-
-" Keymaps: {{{2
-" =======
-
-syn match  vimKeymapStart	"^"	contained skipwhite nextgroup=vimKeymapLhs,@vimKeymapLineComment
-syn match  vimKeymapLhs	"\S\+"	contained skipwhite nextgroup=vimKeymapRhs contains=vimNotation
-syn match  vimKeymapRhs	"\S\+"	contained skipwhite nextgroup=vimKeymapTailComment contains=vimNotation
-syn match  vimKeymapTailComment	"\S.*"	contained
-
-" TODO: remove when :" comment is matched in parts as "ex-colon comment" --djk
-if s:vim9script
-  syn match  vim9KeymapLineComment	"#.*"	contained contains=@vimCommentGroup,vimCommentString,vim9CommentTitle
-else
-  syn match  vimKeymapLineComment	+".*+	contained contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-endif
-syn cluster vimKeymapLineComment contains=vim9\=KeymapLineComment
-
-syn region vimLoadkeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>" end="\%$" contains=vimKeymapStart
-
-" Special Filenames, Modifiers, Extension Removal: {{{2
-" ===============================================
-syn match	vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%$"ms=s+1		nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"#\d\+\|[#%]<\>"		nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
-
-syn match	vimSpecFile	contained		"%[ \t:]"me=e-1	nextgroup=vimSpecFileMod
-syn match	vimSpecFile	contained	excludenl	"%$"	nextgroup=vimSpecFileMod
-syn match	vimSpecFile	contained		"%<"me=e-1	nextgroup=vimSpecFileMod
-
-" User-Specified Commands: {{{2
-" =======================
-syn cluster	vimUserCmdList	contains=@vimCmdList,vimCmplxRepeat,@vimComment,vimCtrlChar,vimEscapeBrace,@vimFunc,vimNotation,vimNumber,vimOper,vimRegister,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange
-
-syn match	vimUserCmd	"\<com\%[mand]\>!\="		skipwhite        nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
-syn match	vimUserCmd	+\<com\%[mand]\>!\=\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
-
-syn region	vimUserCmdAttrs	    contained
-      \ start="-\l"
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ end="\ze\s\u"
-      \ skipwhite nextgroup=vimUserCmdName
-      \ contains=@vimContinue,vimUserCmdAttr,vimUserCmdAttrError
-      \ transparent
-syn match	vimUserCmdAttrError contained	"-\a\+\ze\%(\s\|=\)"
-syn match	vimUserCmdAttr	  contained	"-addr="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrAddr
-syn match	vimUserCmdAttr	  contained	"-bang\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-bar\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-buffer\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-complete="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrComplete,vimUserCmdError
-syn match	vimUserCmdAttr	  contained	"-count\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-count="		contains=vimUserCmdAttrKey nextgroup=vimNumber
-syn match	vimUserCmdAttr	  contained	"-keepscript\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-nargs="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrNargs
-syn match	vimUserCmdAttr	  contained	"-range\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-range="		contains=vimUserCmdAttrKey nextgroup=vimNumber,vimUserCmdAttrRange
-syn match	vimUserCmdAttr	  contained	"-register\>"		contains=vimUserCmdAttrKey
-
-syn match	vimUserCmdAttrNargs	contained	"[01*?+]"
-syn match	vimUserCmdAttrRange	contained	"%"
-
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nousercmderror")
- syn match	vimUserCmdError	contained	"\S\+\>"
-endif
-
-syn case ignore
-syn keyword	vimUserCmdAttrKey   contained	a[ddr] ban[g] bar bu[ffer] com[plete] cou[nt] k[eepscript] n[args] ra[nge] re[gister]
-
-" GEN_SYN_VIM: vimUserCmdAttrComplete, START_STR='syn keyword vimUserCmdAttrComplete contained', END_STR=''
-syn keyword vimUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype function help highlight history keymap locale mapclear mapping menu messages option packadd runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
-syn keyword	vimUserCmdAttrComplete	contained	custom customlist nextgroup=vimUserCmdAttrCompleteFunc,vimUserCmdError
-syn match	vimUserCmdAttrCompleteFunc	contained	",\%([bwglstav]:\|<[sS][iI][dD]>\)\=\h\w*\%([.#]\h\w*\)*"hs=s+1 nextgroup=vimUserCmdError contains=vimVarScope,vimFunctionSID
-
-" GEN_SYN_VIM: vimUserCmdAttrAddr, START_STR='syn keyword vimUserCmdAttrAddr contained', END_STR=''
-syn keyword vimUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
-syn match	vimUserCmdAttrAddr     contained	"?"
-syn case match
-
-syn match	vimUserCmdName	    contained	"\<\u[[:alnum:]]*\>"		skipwhite        nextgroup=vimUserCmdBlock,vimUserCmdReplacement
-syn match	vimUserCmdName	    contained	+\<\u[[:alnum:]]*\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimUserCmdBlock,vimUserCmdReplacement
-syn region	vimUserCmdReplacement contained
-      \ start="\S"
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue,@vimUserCmdList,vimComFilter
-      \ keepend
-syn region	vimUserCmdBlock	    contained
-      \ matchgroup=vimSep
-      \ start="{"
-      \ end="^\s*\zs}"
-      \ contains=@vimDefBodyList,@vimUserCmdList
-
-syn match	vimDelcommand		"\<delc\%[ommand]\>"	skipwhite nextgroup=vimDelcommandAttr,vimDelcommandName
-syn match	vimDelcommandAttr	contained	"-buffer\>"		skipwhite nextgroup=vimDelcommandName
-syn match	vimDelcommandName	contained	"\<\u[[:alnum:]]*\>"
-
-" Lower Priority Comments: after some vim commands... {{{2
-" =======================
-if get(g:, "vimsyn_comment_strings", 1)
-  syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e end='"' extend
-endif
-
-if s:vim9script
-  syn cluster vimComment contains=vim9Comment
-else
-  syn cluster vimComment contains=vimComment
-endif
-
-VimL syn region	vimComment
-      \ excludenl
-      \ start=+"+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="$"
-      \ contains=@vimCommentGroup,vimCommentString
-      \ extend
-Vim9 syn region	vim9Comment
-      \ excludenl
-      \ start="\%#=1\s\@1<=#\%({\@!\|{{\)"
-      \ skip="\n\s*\%(\\\|#\\ \)"
-      \ end="$"
-      \ contains=@vimCommentGroup,vimCommentString
-      \ extend
-
-syn match	vim9CommentError	contained	"#.*"
-syn match	vimCommentError	contained	+".*+
-
-" Environment Variables: {{{2
-" =====================
-syn match	vimEnvvar	"\$\I\i*"
-syn match	vimEnvvar	"\${\I\i*}"
-
-" Strings {{{2
-" =======
-
-" In-String Specials:
-" Try to catch strings, if nothing else matches (therefore it must precede the others!)
-"  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
-" syn region	vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
-syn match	vimPatSepErr	contained	"\\)"
-syn match	vimPatSep	contained	"\\|"
-syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@vimStringGroup
-syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
-syn match	vimNotPatSep	contained	"\\\\"
-syn cluster	vimStringGroup	contains=vimEscape,vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscript contains=@vimStringGroup extend
-syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscript contains=vimQuoteEscape  extend
-"syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
-
-syn match	vimEscape	contained	"\\."
-" syn match	vimEscape	contained	+\\[befnrt\"]+
-syn match	vimEscape	contained	"\\\o\{1,3}\|\\[xX]\x\{1,2}\|\\u\x\{1,4}\|\\U\x\{1,8}"
-syn match	vimEscape	contained	"\\<" contains=vimNotation
-syn match	vimEscape	contained	"\\<\*[^>]*>\=>"
-syn match	vimQuoteEscape	contained	"''"
-
-syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscript contains=@vimStringInterpolation,vimQuoteEscape  extend
-syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscript contains=@vimStringInterpolation,@vimStringGroup extend
-syn region	vimStringInterpolationExpr  oneline contained matchgroup=vimSep start=+{+ end=+}+ contains=@vimExprList
-syn match	vimStringInterpolationBrace contained "{{"
-syn match	vimStringInterpolationBrace contained "}}"
-syn cluster	vimStringInterpolation contains=vimStringInterpolationExpr,vimStringInterpolationBrace
-
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,vimQuoteEscape
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
-
-" Substitutions: {{{2
-" =============
-syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
-syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
-syn cluster	vimSubstList	add=vimCollection
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\>"		skipwhite nextgroup=vimSubstPat,vimSubstFlags,vimSubstCount
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=vimSubstPat
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=vimSubstCount
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\>"		skipwhite nextgroup=vimSubstPat,vimSubstFlags,vimSubstCount
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=vimSubstPat
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=vimSubstCount
-syn match	vimSubstFlagErr	contained	"[^< \t\r|]\+" contains=vimSubstFlags
-" & and # after :s are always pattern delimiters not flags
-syn match	vimSubstFlags	contained	"[&cegiIlnpr#]\+"	skipwhite nextgroup=vimSubstCount
-syn match	vimSubstCount	contained	"\d\+\>"
-" TODO: Vim9 illegal separators for abbreviated :s form are [-.:], :su\%[...] required
-"     : # is allowed but "not recommended" (see :h pattern-delimiter)
-syn region	vimSubstPat	contained	matchgroup=vimSubstDelim start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
-syn region	vimSubstRep4	contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>"	contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
-syn region	vimCollection	contained 	transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
-syn match	vimCollClassErr	contained	"\[:.\{-\}:\]"
-syn match	vimCollClass	contained 	transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|retu\%[rn]\|tab\|escape\|backspace\):\]"
-syn match	vimSubstSubstr	contained	"\\z\=\d"
-syn match	vimSubstTwoBS	contained	"\\\\"
-
-" TODO: flags, unlike count, must follow immediately
-"     : distinguish from with Vim9 &var
-" syn match	vimSubst		"^\s*\zs&&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst		"^\s*\zs\~&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst1	contained	"&&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst1	contained	"\~&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-
-" two and three letter variants (matched as :s + flags, count may follow immediately)
-syn match	vimSubst		"^\s*\zssc[egiIlnp]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssi[ceInpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssI[ceginplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssr[cgiInplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-
-syn match	vimSubst1	contained	"\<sc[egiIlnp]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<si[ceInpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sI[ceginplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sr[cgiInplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-
-" Vi compatibility
-syn match	vimSubstDelim	contained	"\\"
-syn match	vimSubstPat	contained	"\\\ze[/?&]" contains=vimSubstDelim nextgroup=vimSubstRep4
-
-" Mark: {{{2
-" ====
-VimL syn match	vimExMark	"\<k\%([a-zA-Z0-9]\>\|[[\]<>'`]\)\@="         nextgroup=@vimMarkArg
-VimL syn match	vimExMark	"\<k\>"	      	skipwhite nextgroup=@vimMarkArg
-syn match	vimExMark	"\<mark\>"	      	skipwhite nextgroup=@vimMarkArg
-
-syn match	vimMarkArg	contained	"[a-zA-Z]\>\|[[\]<>'`]"	skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimMarkArgError	contained	"["^.(){}0-9]"
-syn cluster	vimMarkArg	contains=vimMarkArg,vimMarkArgError
-
-" Marks, Registers, Addresses, Filters: {{{2
-syn match	vimMark	"'[a-zA-Z0-9]\ze\s*$"
-syn match	vimMark	"'[[\]{}()<>'`"^.]\ze\s*$"
-syn match	vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	"'[[\]{}()<>'`"^.]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	",\zs'[[\]{}()<>'`"^.]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMarkNumber	"[-+]\d\+"		contained contains=vimOper nextgroup=vimSubst1
-syn match	vimPlainMark contained	"'[a-zA-Z0-9]"
-syn match	vimRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=vimMark	skipwhite nextgroup=vimFilter
-
-syn match	vimRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
-syn match	vimRegister	'@"'
-syn match	vimLetRegister	contained	'@["@0-9\-a-zA-Z:.%#=*+~_/]'
-
-syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
-syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
-
-syn match	vimFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=vimOper,vimSpecFile
-
-" Complex Repeats: (:h complex-repeat) {{{2
-" ===============
-syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
-
-" NOTE: :* as an alias for :@ is not supported, this is considered a :range,
-" see :help cpo-star
-syn match	vimAtArg	contained	+@\@1<=[0-9a-z".=*+:@]+
-syn match	vimAt	+@[0-9a-z".=*+:@]\ze\s*\%($\|[|"#]\)+	skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment contains=vimAtArg
-" Vim9: avoid LHS assignment mismatching of :@["#]
-syn match	vimAt	+@\ze\s*\%($\||\|\s["#]\)+		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" Set command and associated set-options (vimOptions) with comment {{{2
-syn match	vimSet		"\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skipwhite nextgroup=vimSetBang,vimCmdSep,vimComment,vimSetArgs
-syn region	vimSetComment	contained	start=+"+ skip=+\n\s*\%(\\\||"\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString extend
-syn match	vimSetCmdSep	contained	"|" skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
-syn match	vimSetEscape	contained	"\\\%(\\[|"]\|.\)"
-syn match	vimSetBarEscape	contained	"\\|"
-syn match	vimSetQuoteEscape	contained	+\\"+
-syn region	vimSetArgs	contained
-      \ start="\l\|<"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*"\\ +
-      \ end=+\ze\\\@1<![|"]+
-      "\ assume this isn't an escaped char with backslash on the previous line
-      \ end=+^\s*\\\ze[|"]+
-      \ end="\ze\s#"
-      \ end="$"
-      \ nextgroup=vimSetCmdSep,vimSetComment,vim9Comment
-      \ contains=@vimContinue,vimErrSetting,vimOption,vimSetAll,vimSetTermcap
-      \ keepend
-" TODO: restrict this to valid values?
-syn match	vimOption	contained	"<[^>]\+>"	contains=vimOption
-syn region	vimSetEqual	contained
-      \ matchgroup=vimOper
-      \ start="[=:]\|[-+^]="
-      \ skip=+\\\s\|^\s*\%(\\\|["#]\\ \)+
-      \ end="\ze\s"
-      \ contains=@vimContinue,vimCtrlChar,vimEnvvar,vimNotation,vimSetSep,vimSetEscape,vimSetBarEscape,vimSetQuoteEscape
-syn match	vimSetBang	contained	"\a\@1<=!" skipwhite nextgroup=vimSetAll,vimSetTermcap
-syn keyword	vimSetAll	contained	all nextgroup=vimSetMod
-syn keyword	vimSetTermcap	contained	termcap
-syn match	vimSetSep	contained	"[,:]"
-syn match	vimSetMod	contained	"\a\@1<=\%(&vim\=\|[!&?<]\)"
-
-" Variable Declarations: {{{2
-" =====================
-VimL syn keyword	vimLet	let		skipwhite nextgroup=@vimSpecialVar,vimVar,vimVarList,vimLetVar
-VimL syn keyword	vimConst	cons[t]		skipwhite nextgroup=@vimSpecialVar,vimVar,vimVarList,vimLetVar
-syn region	vimVarList	contained
-      \ start="\[" end="]"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vimContinue,@vimSpecialVar,vimVar
-syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscript
-hi link vimLetVar vimVar
-syn region	vimLetVarSubscript contained
-      \ matchgroup=vimSubscriptBracket
-      \ start="\S\@1<=\["
-      \ end="]"
-      \ skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc
-      \ contains=@vimExprList
-
-syn keyword	vimUnlet		unl[et]	skipwhite nextgroup=vimUnletBang,vimUnletVars
-syn match	vimUnletBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimUnletVars
-syn region	vimUnletVars	contained
-      \ start="$\I\|\h" skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*["#]\\ + end="$" end=+\ze\s*[|"#]+
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-      \ contains=@vimContinue,vimEnvvar,vimVar,vimVimVar
-
-" TODO: type error after register or environment variables (strings)
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*trim\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1\=\z2$"
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="=<<\%(\s*\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop end="^\z1$"
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*\%(trim\s\+eval\|eval\s\+trim\)\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1\=\z2$"
-      \ contains=@vimStringInterpolation
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="=<<\s*eval\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1$"
-      \ contains=@vimStringInterpolation
-      \ extend
-
-Vim9 syn keyword	vim9Const	const	skipwhite nextgroup=vim9Variable,vim9VariableList
-Vim9 syn keyword	vim9Final	final	skipwhite nextgroup=vim9Variable,vim9VariableList
-Vim9 syn keyword	vim9Var	var	skipwhite nextgroup=vim9Variable,vim9VariableList
-
-syn match	vim9Variable	contained	"\<\h\w*\>"	skipwhite nextgroup=vim9VariableTypeSep,vimLetHeredoc,vimOper
-syn region	vim9VariableList	contained	start="\[" end="]" contains=@vimContinue,@vimSpecialVar,vim9Variable skipwhite nextgroup=vimLetHeredoc
-
-syn match	vim9VariableTypeSep	contained	"\S\@1<=:\%(\s\|\n\)\@="		skipwhite nextgroup=@vim9VariableType
-syn keyword	vim9VariableType		contained	blob bool channel float job number string void	skipwhite nextgroup=vimLetHeredoc
-syn keyword	vim9VariableTypeAny	contained	any			skipwhite nextgroup=vimLetHeredoc
-syn match	vim9VariableTypeObject	contained	"\<object<\@="			          nextgroup=vim9VariableTypeObjectArgs
-syn region	vim9VariableTypeObjectArgs
-      \ matchgroup=vim9VariableTypeObjectBracket
-      \ start="<"
-      \ end=">"
-      \ contains=vimTypeAny,vimTypeObject,vimUserType
-      \ oneline
-      \ transparent
-syn match	vim9VariableType		contained	"\<\%(func\)\>"			skipwhite nextgroup=vimLetHeredoc
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<func("
-      \ end=")"
-      \ skipwhite nextgroup=vim9VariableTypeSep,vimLetHeredoc
-      \ contains=@vim9Continue,@vim9VariableType
-      \ transparent
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<tuple<"
-      \ end=">"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vim9Continue,@vim9VariableType
-      \ transparent
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<\%(list\|dict\)<"
-      \ end=">"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vim9VariableType
-      \ oneline
-      \ transparent
-syn match	vim9VariableUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"	skipwhite nextgroup=vimLetHeredoc
-
-syn cluster vim9VariableType contains=vim9VariableType,vim9VariableTypeAny,vim9VariableTypeObject,vim9VariableCompoundType,vim9VariableUserType
-
-" Lockvar and Unlockvar: {{{2
-" =====================
-syn keyword	vimLockvar	lockv[ar]	skipwhite nextgroup=vimLockvarBang,vimLockvarDepth,vimLockvarVars
-syn keyword	vimUnlockvar	unlo[ckvar]	skipwhite nextgroup=vimLockvarBang,vimLockvarDepth,vimLockvarVars
-syn match	vimLockvarBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimLockvarVars
-syn match	vimLockvarDepth	contained	"\<[0-3]\>"	skipwhite nextgroup=vimLockvarVars
-syn region	vimLockvarVars	contained
-      \ start="\h" skip=+\n\s*\%(\\\|"\\ \)\|^\s*"\\ + end="$" end="\ze[|"]"
-      \ nextgroup=vimCmdSep,vimComment
-      \ contains=@vimContinue,vimVar
-
-hi def link vimLockvar vimCommand
-hi def link vimUnlockvar vimCommand
-hi def link vimLockvarBang vimBang
-hi def link vimLockvarDepth vimNumber
-
-" For: {{{2
-" ===
-" handles Vim9 and legacy for now
-syn region	vimFor
-      \ matchgroup=vimCommand
-      \ start="\<for\>" end="\<in\>"
-      \ skipwhite skipnl nextgroup=@vimForInContinue,vim9ForInComment,@vimExprList
-      \ contains=@vimContinue,vimVar,vimVarList,vim9Variable,vim9VariableList
-      \ transparent
-
-syn match	vim9ForInComment		contained	"#.*"	skipwhite skipempty nextgroup=vimForInComment,@vimExprList
-
-syn match	vimForInContinue		contained	"^\s*\zs\\"	 skipwhite skipnl nextgroup=@vimForInContinue,@vimExprList
-syn match         vimForInContinueComment	contained	'^\s*\zs["#]\\ .*' skipwhite skipnl nextgroup=@vimForInContinue,@vimExprList
-syn cluster	vimForInContinue		contains=vimForInContinue,vimForInContinueComment
-
-" Abbreviations: {{{2
-" =============
-" GEN_SYN_VIM: vimCommand abbrev, START_STR='syn keyword vimAbb', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-" GEN_SYN_VIM: vimCommand abclear, START_STR='syn keyword vimAbb', END_STR='skipwhite nextgroup=vimMapMod'
-
-" Filename Patterns: {{{2
-" =================
-
-syn match	vimWildcardQuestion	contained	"?"
-syn match	vimWildcardStar		contained	"*"
-
-syn match	vimWildcardBraceComma	contained	","
-syn region	vimWildcardBrace		contained
-      \ matchgroup=vimWildcard
-      \ start="{"
-      \ end="}"
-      \ contains=vimWildcardEscape,vimWildcardBrace,vimWildcardBraceComma,vimWildcardQuestion,vimWildcardStar,vimWildcardBracket
-      \ oneline
-
-syn match	vimWildcardIntervalNumber	contained	"\d\+"
-syn match	vimWildcardInterval	contained	"\\\\\\{\d\+\%(,\d\+\)\=\\}" contains=vimWildcardIntervalNumber
-
-
-syn match	vimWildcardBracket	contained	"\[\%(\^\=]\=\%(\\.\|\[\([:.=]\)[^:.=]\+\1]\|[^][:space:]]\)*\)\@>]"
-      \ contains=vimWildcardBracketStart,vimWildcardEscape
-
-syn match	vimWildcardBracketCharacter	contained	"."	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketHyphen,vimWildcardBracketEnd
-syn match	vimWildcardBracketRightBracket	contained	"]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketHyphen	contained	"-]\@!"	nextgroup=@vimWildcardBracketCharacter
-syn match	vimWildcardBracketEscape	contained	"\\."	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketHyphen,vimWildcardBracketEnd
-syn match	vimWildcardBracketCharacterClass	contained	"\[:[^:]\+:]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketEquivalenceClass	contained	"\[=[^=]\+=]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketCollatingSymbol	contained	"\[\.[^.]\+\.]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-
-syn match	vimWildcardBracketStart	contained	"\["	nextgroup=vimWildcardBracketCaret,vimWildcardBracketRightBracket,@vimWildcardBracketCharacter
-syn match	vimWildcardBracketCaret	contained	"\^"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
-syn match	vimWildcardBracketEnd	contained	"]"
-
-syn cluster	vimWildcardBracketCharacter	contains=vimWildcardBracketCharacter,vimWildcardBracketEscape,vimWildcardBracketCharacterClass,vimWildcardBracketEquivalenceClass,vimWildcardBracketCollatingSymbol
-
-syn match	vimWildcardEscape	contained	"\\."
-
-syn cluster	vimWildcard		contains=vimWildcardQuestion,vimWildcardStar,vimWildcardBrace,vimWildcardBracket,vimWildcardInterval
-
-" Autocmd and Doauto{cmd,all}: {{{2
-" ===========================
-
-" TODO: explicitly match the {cmd} arg rather than bailing out to TOP
-syn region	vimAutocmdBlock	contained	matchgroup=vimSep start="{" end="^\s*\zs}" contains=@vimDefBodyList
-
-syn match	vimAutocmdGroup	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+" skipwhite nextgroup=vimAutoEvent,vimAutoEventGlob
-syn match	vimAutocmdBang	contained	"\a\@1<=!"		     skipwhite nextgroup=vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
-
-" TODO: cleaner handling of | in pattern position
-"     : match pattern items in addition to wildcards
-syn region	vimAutocmdPattern	contained
-      \ start="|\@!\S"
-      \ skip="\\\\\|\\[,[:space:]]"
-      \ end="\ze[,[:space:]]"
-      \ end="$"
-      \ skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
-      \ contains=vimEnvvar,@vimWildcard,vimAutocmdPatternEscape
-syn match	vimAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
-" trailing pattern separator comma allowed
-syn match	vimAutocmdPatternSep	contained	","	                skipwhite nextgroup=@vimAutocmdPattern,vimAutocmdMod,vimAutocmdBlock
-syn match	vimAutocmdPatternEscape	contained	"\\."
-syn cluster	vimAutocmdPattern		contains=vimAutocmdPattern,vimAutocmdBufferPattern
-
-" TODO: Vim9 requires '++' prefix
-syn match	vimAutocmdMod	contained	"\%(++\)\=\<nested\>" skipwhite nextgroup=vimAutocmdMod,vimAutocmdBlock
-syn match	vimAutocmdMod	contained	"++once\>"	skipwhite nextgroup=vimAutocmdMod,vimAutocmdBlock
-
-" higher priority than vimAutocmdGroup, assume no group is so named
-syn match	vimAutoEventGlob	contained	"*"	skipwhite nextgroup=@vimAutocmdPattern
-syn match	vimAutoEventSep	contained	"\a\@1<=,"	nextgroup=vimAutoEvent
-syn match	vimUserAutoEventSep contained	"\a\@1<=,"	nextgroup=vimUserAutoEvent
-
-syn match	vimAutocmd		"\<au\%[tocmd]\>"	skipwhite nextgroup=vimAutocmdBang,vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
-
-
-syn match	vimDoautocmdMod	contained	"<nomodeline>"		skipwhite nextgroup=vimAutocmdGroup,vimAutoEvent
-syn match	vimDoautocmd		"\<do\%[autocmd]\>"	skipwhite nextgroup=vimDoautocmdMod,vimAutocmdGroup,vimAutoEvent
-syn match	vimDoautocmd		"\<doautoa\%[ll]\>"	skipwhite nextgroup=vimDoautocmdMod,vimAutocmdGroup,vimAutoEvent
-
-" Echo And Execute: -- prefer strings! {{{2
-" ================
-" NOTE: No trailing comments
-
-syn region	vimEcho
-      \ matchgroup=vimCommand
-      \ start="\<ec\%[ho]\>"
-      \ start="\<echoe\%[rr]\>"
-      \ start="\<echom\%[sg]\>"
-      \ start="\<echoc\%[onsole]\>"
-      \ start="\<echon\>"
-      \ start="\<echow\%[indow]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment
-      \ transparent
-
-syn match	vimEchohl	"\<echohl\=\>"	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchohlNone
-syn case ignore
-syn keyword	vimEchohlNone	contained none
-syn case match
-
-syn cluster	vimEcho	contains=vimEcho,vimEchohl
-
-syn region	vimExecute
-      \ matchgroup=vimCommand
-      \ start="\<exe\%[cute]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment
-      \ transparent
-
-syn region	vimEval
-      \ matchgroup=vimCommand
-      \ start="\<ev\%[al]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment,vimComment
-      \ transparent
-
-" Filter: {{{2
-" ======
-syn match	vimExFilter		"\<filt\%[er]\>"	skipwhite nextgroup=vimExFilterBang,vimExFilterPattern
-syn region	vimExFilterPattern contained
-      \ start="[[:ident:]]"
-      \ end="\ze[[:space:]\n]"
-      \ skipwhite nextgroup=@vimCmdList
-      \ contains=@vimSubstList
-      \ oneline
-syn region	vimExFilterPattern contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:ident:]|"]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimCmdList
-      \ contains=@vimSubstList
-      \ oneline
-syn match	vimExFilterBang	 contained	"\a\@1<=!"	skipwhite nextgroup=vimExFilterPattern
-
-" Grep and Make: {{{2
-" =============
-" | is the command separator, escaped with \| all other backslashes are passed through literally, no tail comments
-syn match	vimGrep		"\<l\=gr\%[ep]\>"		skipwhite nextgroup=vimGrepBang,vimGrepArgs,vimCmdSep
-syn match	vimGrepadd		"\<l\=grepa\%[dd]\>"	skipwhite nextgroup=vimGrepBang,vimGrepArgs,vimCmdSep
-syn region	vimGrepArgs	contained
-      \ start="|\@!\S"
-      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="$"
-      "\ TODO: include vimSpecFile
-      \ contains=vimGrepBarEscape
-syn match	vimGrepBarEscape	contained	"\\|"
-syn match	vimGrepBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimGrepArgs,vimCmdSep
-
-syn match	vimMake		"\<l\=make\=\>"		skipwhite nextgroup=vimMakeBang,vimMakeArgs,vimCmdSep
-syn region	vimMakeArgs	contained
-      \ start="|\@!\S"
-      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="$"
-      "\ TODO: include vimSpecFile
-      \ contains=vimMakeBarEscape
-syn match	vimMakeBarEscape	contained	"\\|"
-syn match	vimMakeBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimMakeArgs,vimCmdSep
-
-" Help*: {{{2
-" =====
-syn match	vimHelp	"\<h\%[elp]\>"	skipwhite nextgroup=vimHelpBang,vimHelpArg,vimHelpNextCommand
-" TODO: match wildcards, ignoring exceptions?
-syn region	vimHelpArg	contained
-      \ start="\S"
-      \ matchgroup=Special
-      \ end="\%(@\a\a\)\=\ze\s*\%($\|\%x0d\|\%x00\||[^|]\)"
-      \ oneline
-syn match	vimHelpNextCommand	contained	"\ze|[^|]"	skipwhite nextgroup=vimCmdSep
-syn match	vimHelpBang		contained	"\a\@1<=!"	skipwhite nextgroup=vimHelpArg,vimHelpNextCommand
-
-syn match	vimHelpgrep		"\<l\=helpg\%[rep]\>"	skipwhite nextgroup=vimHelpgrepBang,vimHelpgrepPattern
-syn region	vimHelpgrepPattern	contained
-      \ start="\S"
-      \ matchgroup=Special
-      \ end="@\a\a\>"
-      \ end="$"
-      \ contains=@vimSubstList
-      \ oneline
-
-" Vimgrep: {{{2
-" =======
-syn match	vimVimgrep		"\<l\=vim\%[grep]\>"	skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern
-syn match	vimVimgrepadd		"\<l\=vimgrepa\%[dd]\>"	skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern
-syn match	vimVimgrepBang	  contained	"\a\@1<=!"		skipwhite nextgroup=vimVimgrepPattern
-syn region	vimVimgrepPattern   contained
-      \ start="[[:ident:]]"
-      \ end="\ze[[:space:]\n]"
-      \ skipwhite nextgroup=vimVimgrepFile,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-syn region	vimVimgrepPattern   contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:ident:]|"]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=vimVimgrepFlags,vimVimgrepFile,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-syn match	vimVimgrepEscape	  contained	"\\\%(\\|\|.\)"
-syn match	vimVimgrepBarEscape contained	"\\|"
-syn region	vimVimgrepFile	  contained
-      \ start="|\@!\S"
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="\ze\s"
-      \ end="$"
-      \ skipwhite nextgroup=vimVimgrepFile
-      \ contains=vimSpecFile,vimVimgrepEscape,vimVimgrepBarEscape
-syn match	vimVimgrepFlags	  contained	"\<[gjf]\{,3\}\>" skipwhite nextgroup=vimVimgrepfile
-
-" Maps: {{{2
-" ====
-" GEN_SYN_VIM: vimCommand map, START_STR='syn keyword vimMap', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-syn match	vimMap	"\<map\>"	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	vimMap	no[remap]	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-" GEN_SYN_VIM: vimCommand mapclear, START_STR='syn keyword vimMap', END_STR='skipwhite nextgroup=vimMapMod'
-syn keyword	vimMap	mapc[lear]	skipwhite nextgroup=vimMapBang,vimMapMod
-" GEN_SYN_VIM: vimCommand unmap, START_STR='syn keyword vimUnmap', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-syn keyword	vimUnmap	unm[ap]	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-
-syn match	vimMapLhs	contained	"\%(.\|\S\)\+"		contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite        nextgroup=vimMapRhs
-syn match	vimMapLhs	contained	"\%(.\|\S\)\+\ze\s*$"	contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite skipnl nextgroup=vimMapRhsContinue
-syn match	vimMapBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimMapMod,vimMapLhs
-syn match	vimMapMod	contained	"\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
-syn region	vimMapRhs	contained
-      \ start="\S"
-      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader
-syn region	vimMapRhsContinue	contained
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader
-syn match	vimMapLeader	contained	"\%#=1\c<\%(local\)\=leader>"	contains=vimMapLeaderKey
-syn keyword	vimMapModKey	contained	buffer expr nowait script silent special unique
-syn case ignore
-syn keyword	vimMapLeaderKey	contained	leader localleader
-syn case match
-
-" Menus: {{{2
-" =====
-" NOTE: tail comments disallowed
-" GEN_SYN_VIM: vimCommand menu, START_STR='syn keyword vimMenu', END_STR='skipwhite nextgroup=vimMenuBang,vimMenuMod,vimMenuName,vimMenuPriority,vimMenuStatus'
-syn keyword vimMenu popu[p] skipwhite nextgroup=vimMenuBang,vimMenuName
-syn region	vimMenuRhs	 contained contains=@vimContinue,vimNotation start="|\@!\S"            skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=vimSep end="|"
-syn region	vimMenuRhsContinue contained contains=@vimContinue,vimNotation start=+^\s*\%(\\\|"\\ \)+ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=vimSep end="|"
-syn match	vimMenuName	"\.\@!\%(\\\s\|\S\)\+"        contained contains=vimMenuNotation,vimNotation skipwhite        nextgroup=vimCmdSep,vimMenuRhs
-syn match	vimMenuName	"\.\@!\%(\\\s\|\S\)\+\ze\s*$" contained contains=vimMenuNotation,vimNotation skipwhite skipnl nextgroup=vimCmdSep,vimMenuRhsContinue
-syn match	vimMenuNotation	"&\a\|&&\|\\\s\|\\\." contained
-syn match	vimMenuPriority	"\<\d\+\%(\.\d\+\)*\>" contained skipwhite nextgroup=vimMenuName
-syn match	vimMenuMod	"\c<\%(script\|silent\|special\)>" contained skipwhite nextgroup=vimMenuName,vimMenuPriority,vimMenuMod contains=vimMapModKey,vimMapModErr
-syn keyword	vimMenuStatus	enable disable nextgroup=vimMenuName skipwhite
-syn match	vimMenuBang	"\a\@1<=!" contained skipwhite nextgroup=vimMenuName,vimMenuMod
-
-syn region	vimMenutranslate
-      \ matchgroup=vimCommand start="\<menut\%[ranslate]\>"
-      \ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+
-      \ end="$" matchgroup=vimCmdSep end="|" matchgroup=vimMenuClear end="\<clear\ze\s*\%(["#|]\|$\)"
-      \ contains=@vimContinue,vimMenutranslateName keepend transparent
-" oneline is sufficient to match the current formatting in runtime/lang/*.vim
-syn match	vimMenutranslateName "\%(\\\s\|\S\)\+" contained contains=vimMenuNotation,vimNotation
-syn match	vimMenutranslateComment +".*+ contained containedin=vimMenutranslate
-
-" If, While and Return: {{{2
-" ====================
-syn match	vimNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@vimExprList,vimNotation
-syn match	vimElse	"\<el\%[se]\>"			skipwhite nextgroup=vimComment,vim9Comment
-syn match	vimEndif	"\<en\%[dif]\>"			skipwhite nextgroup=vimComment,vim9Comment
-
-" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
-" ======================
-syn case ignore
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}x\=\%(f\d\{1,2}\|[^ \t:]\|space\|bar\|bslash\|nl\|newline\|lf\|linefeed\|cr\|retu\%[rn]\|enter\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|csi\|right\|paste\%(start\|end\)\|left\|help\|undo\|k\=insert\|ins\|mouse\|[kz]\=home\|[kz]\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\%(page\)\=\%(\|down\|up\|k\d\>\)\)>" contains=vimBracket
-
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(net\|dec\|jsb\|pterm\|urxvt\|sgr\)mouse>"		contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(left\|middle\|right\)\%(mouse\|drag\|release\)>"	contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}left\%(mouse\|release\)nm>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}x[12]\%(mouse\|drag\|release\)>"		contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}sgrmouserelease>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}mouse\%(up\|down\|move\)>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}scrollwheel\%(up\|down\|right\|left\)>"		contains=vimBracket
-
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(sid\|nop\|nul\|lt\|drop\)>"				contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(snr\|plug\|cursorhold\|ignore\|cmd\|scriptcmd\|focus\%(gained\|lost\)\)>"	contains=vimBracket
-" syn match	vimNotation	contained	'\%(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
-syn match	vimNotation	contained	'\%#=1\%(\\\|<lt>\)\=<\%([fq]-\)\=\%(line[12]\|count\|bang\|reg\|args\|mods\|lt\)>'		contains=vimBracket skipwhite nextgroup=vimSubst1
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([cas]file\|abuf\|amatch\|cexpr\|cword\|cWORD\|client\|stack\|script\|sf\=lnum\)>"	contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}char-\%(\d\+\|0\o\+\|0x\x\+\)>"		contains=vimBracket
-
-syn match	vimBracket contained	"[\\<>]"
-syn case match
-
-" User Command Highlighting: {{{2
-syn match vimUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
-
-" Vim user commands
-
-" Compiler plugins
-syn match	vimCompilerSet	"\<CompilerSet\>"	skipwhite nextgroup=vimSetArgs
-
-" runtime/makemenu.vim
-syn match	vimSynMenu		"\<SynMenu\>"	skipwhite nextgroup=vimSynMenuPath
-syn match	vimSynMenuPath	contained	".*\ze:"	nextgroup=vimSynMenuColon contains=vimMenuNotation
-syn match	vimSynMenuColon	contained	":"	nextgroup=vimSynMenuName
-syn match	vimSynMenuName	contained	"\w\+"
-
-" runtime/syntax/syncolor.vim
-syn match	vimSynColor		"\<SynColor\>"	skipwhite nextgroup=vimSynColorGroup
-syn match	vimSynColorGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=vimHiKeyList	contains=vimGroup
-syn match	vimSynLink		"\<SynLink\>"	skipwhite nextgroup=vimSynLinkGroup
-syn match	vimSynLinkGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=vimGroup	contains=vimGroup
-
-syn cluster vimExUserCmdList contains=vimCompilerSet,vimSynColor,vimSynLink,vimSynMenu
-
-" Errors And Warnings: {{{2
-" ====================
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
- syn match	vimFunctionError	contained	"[[:space:]!]\@1<=\<[a-z0-9]\w\{-}\ze\s*("
- syn match	vimFunctionError	contained	"\%(<[sS][iI][dD]>\|[sg]:\)\d\w\{-}\ze\s*("
- syn match	vimElseIfErr	"\<else\s\+if\>"
- syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
-endif
-
-" Match: {{{2
-" =====
-syn match	vimMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=vimMatchGroup,vimMatchNone contains=vimCount
-syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=vimMatchPattern
-syn case ignore
-syn keyword	vimMatchNone	contained	none
-syn case match
-syn region	vimMatchPattern	contained
-      \ matchgroup=Delimiter
-      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ contains=@vimSubstList
-      \ oneline
-
-" Normal: {{{2
-" ======
-syn match	vimNormal		"\<norm\%[al]\>!\=" skipwhite nextgroup=vimNormalArg contains=vimBang
-syn region	vimNormalArg	contained	start="\S" skip=+\n\s*\%(\\\|["#]\\ \)+ end="$" contains=@vimContinue
-
-" Profile: {{{2
-" =======
-syn match	vimProfileBang	 contained	"\a\@1<=!"	skipwhite nextgroup=vimProfileArg
-syn keyword	vimProfileArg	 contained	start	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	func	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	file	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	stop pause	skipwhite nextgroup=vimCmdSep,@vimComment
-syn keyword	vimProfileArg	 contained	continue dump	skipwhite nextgroup=vimCmdSep,@vimComment
-" TODO: match file pattern
-syn region	vimProfilePattern contained
-      \ start="\S"
-      \ skip=+\\[|"#]+
-      \ end="$" end=+\ze\s*[|"#]+
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimProfile	"\<prof\%[ile]\>"	skipwhite nextgroup=vimProfileBang,vimProfileArg
-
-syn keyword	vimProfdelArg	contained	func	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfdelArg	contained	file	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfdelArg	contained	here	skipwhite nextgroup=vimCmdSep,@vimComment
-syn match	vimProfdel	"\<profd\%[el]\>" skipwhite nextgroup=vimProfdelArg
-
-" Prompt{find,repl}: {{{2
-" =================
-syn region	vimPromptArg	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue
-syn keyword	vimPrompt	promptf[ind] promptr[epl]	skipwhite nextgroup=vimPromptArg
-
-" Redir: {{{2
-" =====
-syn match	vimRedir		"\<redir\=\>"	skipwhite nextgroup=vimRedirBang,vimRedirFileOperator,vimRedirVariableOperator,vimRedirRegister,vimRedirEnd
-syn match	vimRedirBang	       contained	"\a\@1<=!"	skipwhite nextgroup=vimRedirFileOperator
-
-syn match	vimRedirFileOperator     contained	">>\="	skipwhite nextgroup=vimRedirFile
-syn region	vimRedirFile	       contained
-      \ start="\S"
-      \ matchgroup=Normal
-      \ end="\s*$"
-      \ end="\s*\ze[|"]"
-      \ nextgroup=vimCmdSep,vimComment
-      \ contains=vimSpecFile
-syn match	vimRedirRegisterOperator contained	">>\="
-syn match	vimRedirRegister	       contained	"@[a-zA-Z*+"]"	nextgroup=vimRedirRegisterOperator
-syn match	vimRedirVariableOperator contained	"=>>\="	skipwhite nextgroup=vimVar
-syn keyword	vimRedirEnd	       contained	END
-
-" Sleep: {{{2
-" =====
-syn keyword	vimSleep		sl[eep]		skipwhite nextgroup=vimSleepBang,vimSleepArg
-syn match	vimSleepBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimSleepArg
-syn match	vimSleepArg	contained	"\<\%(\d\+\)\=m\=\>"
-
-" Sort: {{{2
-" ====
-syn match	vimSort		"\<sort\=\>"			skipwhite nextgroup=vimSortBang,@vimSortOptions,vimSortPattern,vimCmdSep
-syn match	vimSortBang	  contained	"\a\@1<=!"			skipwhite nextgroup=@vimSortOptions,vimSortPattern,vimCmdSep
-syn match	vimSortOptionsError contained	"\a\+"
-syn match	vimSortOptions	  contained	"\<[ilur]*[nfxob]\=[ilur]*\>"		skipwhite nextgroup=vimSortPattern,vimCmdSep
-syn region	vimSortPattern	  contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:alpha:]|]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimSortOptions,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-
-syn cluster vimSortOptions contains=vimSortOptions,vimSortOptionsError
-
-" Terminal: {{{2
-" ========
-syn match	vimTerminal	"\<ter\%[minal]\>"		skipwhite        nextgroup=vimTerminalOptions,vimTerminalCommand
-syn match	vimTerminal	+\<ter\%[minal]\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimTerminalOptions,vimTerminalCommand,@vimTerminalContinue
-
-syn match	vimTerminalContinue	contained	"^\s*\\"       	skipwhite skipnl nextgroup=@vimTerminalContinue,vimTerminalOptions,vimTerminalCommand contains=vimWhitespace
-syn match         vimTerminalContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@vimTerminalContinue,vimTerminalOptions,vimTerminalCommand contains=vimWhitespace
-syn cluster	vimTerminalContinue	contains=vimTerminalContinue,vimTerminalContinueComment
-
-syn region	vimTerminalCommand	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue
-
-syn region	vimTerminalOptions	contained
-      \ start="++"
-      \ skip=/\s\+++\|\%(\n\|^\)\s*\%(\\\|["#]\\ \)/
-      \ end="\s"
-      \ end="$"
-      \ skipwhite nextgroup=vimTerminalCommand
-      \ contains=@vimContinue,vimTerminalOption
-      \ transparent
-
-syn match	vimTerminalOption	contained	"++\%(\%(no\)\=close\|open\|curwin\|hidden\|norestore\|shell\)\>"
-syn match	vimTerminalOption	contained	"++kill="		nextgroup=vimTerminalKillOptionArg
-syn match	vimTerminalOption	contained	"++\%(rows\|cols\)="	nextgroup=vimTerminalSizeOptionArg
-syn match	vimTerminalOption	contained	"++eof="		nextgroup=vimTerminalEofOptionArg
-syn match	vimTerminalOption	contained	"++type="		nextgroup=vimTerminalTypeOptionArg
-syn match	vimTerminalOption	contained	"++api="		nextgroup=vimTerminalApiOptionArg
-
-syn match	vimTerminalApiOptionArg	contained	"\<\S\+\>"
-syn match	vimTerminalEofOptionArg	contained	"\<\S\+\>"
-syn match	vimTerminalSizeOptionArg	contained	"\<\d\+\>"
-syn keyword	vimTerminalKillOptionArg	contained	term hup quit int kill
-syn match	vimTerminalKillOptionArg	contained	"\<\d\+\>"
-syn keyword	vimTerminalTypeOptionArg	contained	conpty winpty
-
-" Uniq: {{{2
-" ====
-syn match	vimUniq		"\<uniq\=\>"	skipwhite nextgroup=vimUniqBang,@vimUniqOptions,vimUniqPattern,vimCmdSep
-syn match	vimUniqBang	  contained	"\a\@1<=!"	skipwhite nextgroup=@vimUniqOptions,vimUniqPattern,vimCmdSep
-syn match	vimUniqOptionsError contained	"\a\+"
-syn match	vimUniqOptions	  contained	"\<[ilur]*\>"	skipwhite nextgroup=vimUniqPattern,vimCmdSep
-syn region	vimUniqPattern	  contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:alpha:]|]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimUniqOptions,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-
-syn cluster vimUniqOptions contains=vimUniqOptions,vimUniqOptionsError
-
-" Wincmd: {{{2
-" ======
-syn match	vimWincmd	"\<winc\%[md]\>"	skipwhite nextgroup=vimWincmdArg
-" TODO: consider extracting this list from the help file
-syn match	vimWincmdArg	contained
-      \ "\<[sSvnqojkhlwWtbpPrRxKJHLTfFz]\>\|[\^:=\-+_<>|\]}]\|\<g\s\+[\]}]\|\<g[fFtT]\>"
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" only handles oneline assignments
-Vim9 syn match	vimWincmd	"\s\=\<winc\%[md]\>\ze\s\+=\s*\%([#|]\|$\)"	skipwhite nextgroup=vimWincmdArg
-
-" Syntax: {{{2
-"=======
-syn region	vimGroupList	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      "\ need to consume the whitespace
-      \ end="\s"he=e-1
-      \ end="$"
-      \ contains=@vimGroupListContinue,vimGroupSpecial,vimGroupListContinueComma
-syn keyword	vimGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
-syn match	vimGroupListComma		contained	","
-syn match	vimGroupListContinueComma	contained	"\s\+,\s*\|,\s\+"	contains=vimGroupListComma
-syn match	vimGroupListContinueComma	contained	"\s*,\s*\%(\n\s*\%(\\\s\+\|["#]\\ .*\)\)\+"	contains=@vimGroupListContinue,vimGroupListComma
-
-syn match	vimGroupListEquals	contained	"="		skipwhite skipnl nextgroup=vimGroupListContinueStart,vimGroupList
-" the first continuation line does not terminate the list at whitepace after \
-syn match	vimGroupListContinueStart	contained	"^\%(\s*["#]\\ .*\n\)*\s*\\\s\+"	skipwhite        nextgroup=vimGroupList contains=@vimGroupListContinue transparent
-
-syn match	vimGroupListContinue	contained	"^\s*\\"	skipwhite skipnl nextgroup=@vimGroupListContinue,vimGroupListContinueComma contains=vimWhitespace
-syn match	vimGroupListContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@vimGroupListContinue		   contains=vimWhitespace
-syn cluster	vimGroupListContinue	contains=vimGroupListContinue,vimGroupListContinueComment
-
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynerror")
- syn match	vimSynError		contained	"\i\+"
-endif
-syn match	vimSynContains		contained	"\<contains\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimSynContainedin		contained	"\<containedin\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimSynNextgroup		contained	"\<nextgroup\>"	skipwhite nextgroup=vimGroupListEquals
-if has("conceal")
- " no whitespace allowed after '='
- syn match	vimSynCchar	contained	"\<cchar="	nextgroup=vimSynCcharValue
- syn match	vimSynCcharValue	contained	"\S"
-endif
-
-syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,@vimComment
-syn cluster vimFunctionBodyList add=vimSyntax
-
-" Syntax: case {{{2
-syn keyword	vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncaseerror")
- syn match	vimSynCaseError	contained	"\i\+"
-endif
-syn keyword	vimSynCase	contained	ignore	match
-
-" Syntax: clear {{{2
-syn keyword	vimSynType	contained	clear
-
-" Syntax: cluster {{{2
-syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
-syn region	vimClusterName	contained keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="$\||" contains=@vimContinue,vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
-syn match	vimGroupAdd	contained	"\<add\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimGroupRem	contained	"\<remove\>"	skipwhite nextgroup=vimGroupListEquals
-
-" Syntax: conceal {{{2
-syn match	vimSynType	contained	"\<conceal\>"	skipwhite nextgroup=vimSynConceal,vimSynConcealError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynconcealerror")
- syn match	vimSynConcealError contained	"\i\+"
-endif
-syn keyword	vimSynConceal	contained	on	off
-
-" Syntax: foldlevel {{{2
-syn keyword	vimSynType	contained	foldlevel	skipwhite nextgroup=vimSynFoldlevel,vimSynFoldlevelError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynfoldlevelerror")
- syn match	vimSynFoldlevelError	contained	"\i\+"
-endif
-syn keyword	vimSynFoldlevel	contained	start	minimum
-
-" Syntax: iskeyword {{{2
-syn keyword	vimSynType		contained	iskeyword	skipwhite nextgroup=vimSynIskeyword
-syn keyword	vimSynIskeyword		contained	clear
-syn match	vimSynIskeyword		contained	"\S\+"	contains=vimSynIskeywordSep
-syn match	vimSynIskeywordSep	contained	","
-
-" Syntax: include {{{2
-syn keyword	vimSynType		contained	include	skipwhite nextgroup=vimSynIncludeCluster
-syn match	vimSynIncludeCluster	contained	"@[_a-zA-Z0-9]\+\>"
-
-" Syntax: keyword {{{2
-syn cluster	vimSynKeyGroup	contains=@vimContinue,vimSynCchar,vimSynNextgroup,vimSynKeyOpt,vimSynContainedin
-syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
-syn region	vimSynKeyRegion	contained         keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynKeyGroup
-syn match	vimSynKeyOpt	contained	"\%#=1\<\%(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
-
-" Syntax: match {{{2
-syn cluster	vimSynMtchGroup	contains=@vimContinue,vimSynCchar,vimSynContains,vimSynContainedin,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation,vimMtchComment
-syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
-syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynMtchGroup
-syn match	vimSynMtchOpt	contained	"\%#=1\<\%(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
-
-" Syntax: off and on {{{2
-syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
-
-" Syntax: region {{{2
-syn cluster	vimSynRegPatGroup	contains=@vimContinue,vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
-syn cluster	vimSynRegGroup	contains=@vimContinue,vimSynCchar,vimSynContains,vimSynContainedin,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
-syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
-syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynRegGroup
-syn match	vimSynRegOpt	contained	"\%#=1\<\%(conceal\%(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
-syn match	vimSynReg	contained	"\<\%(start\|skip\|end\)="	nextgroup=vimSynRegPat
-syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
-syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip=/\\\\\|\\\z1\|\n\s*\%(\\\|"\\ \)/  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
-syn match	vimSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\="
-syn match	vimSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\=," nextgroup=vimSynPatMod
-syn match	vimSynPatMod	contained	"lc=\d\+"
-syn match	vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
-syn region	vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
-syn match	vimSynNotPatRange	contained	"\\\\\|\\\["
-syn match	vimMtchComment	contained	'"[^"]\+$'
-
-" Syntax: spell {{{2
-syn keyword	vimSynType	contained	spell	skipwhite nextgroup=vimSynSpell,vimSynSpellError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynspellerror")
- syn match	vimSynSpellError contained	"\i\+"
-endif
-syn keyword	vimSynSpell	contained	default	notoplevel	toplevel
-
-" Syntax: sync {{{2
-" ============
-syn keyword vimSynType	contained	sync	skipwhite	nextgroup=vimSyncClear,vimSyncMatch,vimSyncError,vimSyncRegion,vimSyncArgs
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncerror")
- syn match	vimSyncError	contained	"\i\+"
-endif
-
-syn region	vimSyncArgs	contained	start="\S" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=vimSyncLines,vimSyncLinebreak,vimSyncLinecont,vimSyncFromstart,vimSyncCcomment
-
-syn keyword	vimSyncCcomment	contained	ccomment	skipwhite	nextgroup=vimGroupName
-syn keyword	vimSyncClear	contained	clear	skipwhite	nextgroup=vimSyncGroupName
-syn keyword	vimSyncFromstart	contained	fromstart
-syn keyword	vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
-syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynRegion
-syn match	vimSyncLinebreak	contained	"\<linebreaks="		nextgroup=vimNumber
-syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
-syn match	vimSyncLines	contained	"\<lines="		nextgroup=vimNumber
-syn match	vimSyncLines	contained	"\<minlines="		nextgroup=vimNumber
-syn match	vimSyncLines	contained	"\<maxlines="		nextgroup=vimNumber
-syn match	vimSyncGroupName	contained	"\<\h\w*\>"	skipwhite	nextgroup=vimSyncKey
-syn match	vimSyncKey	contained	"\<grouphere\>"	skipwhite	nextgroup=vimSyncGroup
-syn match	vimSyncKey	contained	"\<groupthere\>"	skipwhite	nextgroup=vimSyncGroup
-syn match	vimSyncGroup	contained	"\<\h\w*\>"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
-syn keyword	vimSyncNone	contained	NONE
-
-" Syntime: {{{2
-" =======
-syn keyword	vimSyntimeArg	contained	on off clear report	skipwhite nextgroup=vimComment,vim9Comment,vimCmdSep
-syn keyword	vimSyntime		synti[me]		skipwhite nextgroup=vimSyntimeArg
-" Additional IsCommand: here by reasons of precedence {{{2
-" ====================
-syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
-
-" Highlighting: {{{2
-" ============
-syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,@vimComment
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
- syn match	vimHiCtermError	contained	"\D\i*"
-endif
-syn match	vimHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=vimHiBang,@vimHighlightCluster
-syn match	vimHiBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimHighlightCluster
-
-syn case ignore
-" Conceal is a generated low-priority match
-syn match	vimHiGroup	contained	"\%(\<Conceal\>\)\@!\i\+"
-syn keyword	vimHiNone	contained	NONE
-syn keyword	vimHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl underdashed underdotted underdouble
-syn keyword	vimFgBgAttrib	contained	none bg background fg foreground
-syn case match
-syn match	vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
-syn match	vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
-syn case ignore
-syn keyword	vimHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey grey40 grey50 grey90 lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred lightyellow magenta red seagreen white yellow
-syn match	vimHiCtermColor	contained	"\<color\d\{1,3}\>"
-syn case match
-
-syn match	vimHiFontname	contained	"[a-zA-Z\-*]\+"
-syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
-syn match	vimHiGuiRgb	contained	"#\x\{6}"
-
-" Highlighting: hi group key=arg ... {{{2
-syn cluster	vimHiCluster contains=vimGroup,vimHLGroup,vimHiGroup,vimHiNone,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiCtermul,vimHiCtermfont,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation,vimComment,vim9comment
-syn region	vimHiKeyList	contained 	start="\i\+" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|" excludenl end="$" contains=@vimContinue,@vimHiCluster
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror")
- syn match	vimHiKeyError	contained	"\i\+="he=e-1
-endif
-syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiStartStop	contained	"\c\%(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
-syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiCtermul	contained	"\cctermul="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiCtermfont	contained	"\cctermfont="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
-syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
-syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
-syn match	vimHiNmbr	contained	'\d\+'
-
-" Highlight: clear {{{2
-syn keyword	vimHiClear	contained	clear	skipwhite nextgroup=vimGroup,vimHLGroup,vimHiGroup
-
-" Highlight: link {{{2
-" see tst24 (hi def vs hi) (Jul 06, 2018)
-"syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
-" TODO: simplify and allow line continuations --djk
-syn region	vimHiLink	contained matchgroup=Type start="\%(\<hi\%[ghlight]!\=\s\+\)\@<=\%(\%(def\%[ault]\s\+\)\=link\>\|\<def\%[ault]\>\)" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|" excludenl end="$" contains=@vimContinue,@vimHiCluster
-
-" Control Characters: {{{2
-" ==================
-syn match	vimCtrlChar	"[
--]"
-
-" Embedded Scripts:  {{{2
-" ================
-"   perl,ruby	: Benoit Cerrina
-"   python,tcl	: Johannes Zellner
-"   mzscheme, lua : Charles Campbell
-
-" Allows users to specify the type of embedded script highlighting
-" they want:  (lua/mzscheme/perl/python/ruby/tcl support)
-"   g:vimsyn_embed == 0   : don't embed any scripts
-"   g:vimsyn_embed =~# 'l' : embed Lua
-"   g:vimsyn_embed =~# 'm' : embed MzScheme
-"   g:vimsyn_embed =~# 'p' : embed Perl
-"   g:vimsyn_embed =~# 'P' : embed Python
-"   g:vimsyn_embed =~# 'r' : embed Ruby
-"   g:vimsyn_embed =~# 't' : embed Tcl
-
-let s:interfaces = get(g:, "vimsyn_embed", "lP")
-
-" [-- lua --] {{{3
-if s:interfaces =~# 'l'
-  syn include @vimLuaScript syntax/lua.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimLua	lua	skipwhite nextgroup=vimLuaHeredoc,vimLuaStatement
-syn keyword	vimLua	luado	skipwhite nextgroup=vimLuaStatement
-syn keyword	vimLua	luafile
-
-syn region	vimLuaStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimLuaScript,@vimContinue
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimLuaScript
-
-" [-- mzscheme --] {{{3
-if s:interfaces =~# 'm'
-  let s:iskKeep = &l:isk
-  syn include @vimMzSchemeScript syntax/scheme.vim
-  unlet b:current_syntax
-  let &l:isk = s:iskKeep
-endif
-
-syn keyword	vimMzScheme	mz[scheme]	skipwhite nextgroup=vimMzSchemeHeredoc,vimMzSchemeStatement
-syn keyword	vimMzScheme	mzf[ile]
-
-syn region	vimMzSchemeStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimMzSchemeScript,@vimContinue
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimMzSchemeScript
-
-" [-- perl --] {{{3
-if s:interfaces =~# 'p'
-  syn include @vimPerlScript syntax/perl.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPerl	pe[rl]	skipwhite nextgroup=vimPerlHeredoc,vimPerlStatement
-syn keyword	vimPerl	perld[o]	skipwhite nextgroup=vimPerlStatement
-
-syn region	vimPerlStatement	contained
-       \ start="\S"
-       \ skip=+\n\s*\%(\\\|["#]\\ \)+
-       \ end="$"
-       \ contains=@vimPerlScript,@vimContinue
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+<<\s*\z(\S\+\)\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1$+ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+<<\ze\s*$+	matchgroup=vimScriptHeredocStop
-       \ end=+^\.$+
-       \ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1\=\z2$+
-       \ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1\=\.$+
-       \ contains=@vimPerlScript
-
-" [-- python --] {{{3
-if s:interfaces =~# 'P'
-  syn include @vimPythonScript syntax/python2.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPython	py[thon]	skipwhite nextgroup=vimPythonHeredoc,vimPythonStatement
-syn keyword	vimPython	pydo	skipwhite nextgroup=vimPythonStatement
-syn keyword	vimPython	pyfile
-
-syn region	vimPythonStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPythonScript,@vimContinue
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPythonScript
-
-" [-- python3 --] {{{3
-if s:interfaces =~# 'P'
-  syn include @vimPython3Script syntax/python.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPython3	python3 py3	skipwhite nextgroup=vimPython3Heredoc,vimPython3Statement
-syn keyword	vimPython3	py3do	skipwhite nextgroup=vimPython3Statement
-syn keyword	vimPython3	py3file
-
-syn region	vimPython3Statement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPython3Script,@vimContinue
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPython3Script
-
-" [-- pythonx --] {{{3
-if s:interfaces =~# 'P'
-  if &pyxversion == 2
-    syn cluster vimPythonXScript contains=@vimPythonScript
-  else
-    syn cluster vimPythonXScript contains=@vimPython3Script
-  endif
-endif
-
-syn keyword	vimPythonX	pythonx pyx	skipwhite nextgroup=vimPythonXHeredoc,vimPythonXStatement
-syn keyword	vimPythonX	pyxdo	skipwhite nextgroup=vimPythonXStatement
-syn keyword	vimPythonX	pyxfile
-
-syn region	vimPythonXStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPythonXScript,@vimContinue
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPythonXScript
-
-" [-- ruby --] {{{3
-if s:interfaces =~# 'r'
-  syn include @vimRubyScript syntax/ruby.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimRuby	rub[y]	skipwhite nextgroup=vimRubyHeredoc,vimRubyStatement
-syn keyword	vimRuby	rubyd[o]	skipwhite nextgroup=vimRubyStatement
-syn keyword	vimRuby	rubyf[ile]
-
-syn region	vimRubyStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimRubyScript,@vimContinue
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+	matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\.$+
-      \ contains=@vimRubyScript
-
-" [-- tcl --] {{{3
-if s:interfaces =~# 't'
-  syn include @vimTclScript syntax/tcl.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimTcl	tcl	skipwhite nextgroup=vimTclHeredoc,vimTclStatement
-syn keyword	vimTcl	tcld[o]	skipwhite nextgroup=vimTclStatement
-syn keyword	vimTcl	tclf[ile]
-syn region	vimTclStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimTclScript,@vimContinue
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimTclScript
-
-unlet s:interfaces
-" Function Call Highlighting: {{{2
-" (following Gautam Iyer's suggestion)
-" ==========================
-syn match	vimFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-syn match	vimUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=vimOperParen,vim9TypeArgs
-syn match	vimUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
-syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
-syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
-
-Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
-Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-
-syn cluster	vimFunc	contains=vimFunc,vimUserFunc
-syn cluster	vim9Func	contains=vim9Func,vim9UserFunc
-
-syn region	vim9TypeArgs	contained
-      \ matchgroup=Delimiter
-      \ start="<\ze\a"
-      \ end=">"
-      \ nextgroup=vimOperParen
-      \ contains=@vimType
-      \ oneline
-
-" Beginners - Patterns that involve ^ {{{2
-" =========
-Vim9 syn region	vim9LineComment	start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\%(\\\|#\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString,vim9CommentTitle extend
-VimL syn region	vimLineComment	start=+^[ \t:]*\zs".*$+ skip=+\n\s*\%(\\\|"\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString,vimCommentTitle extend
-
-syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
-syn match	vim9CommentTitle	'#\s*\%([sS]:\|\h\w*#\)\=\%([A-DF-Z]\w*\|E\%(\d\{1,4}\>\)\@!\w*\)\(\s\+\u\w*\)*:'hs=s+1	contained contains=vim9CommentTitleLeader,vimTodo,@vimCommentGroup
-
-" allowed anywhere in the file
-if !s:vim9script
-  syn match	vimShebangError	"^\s*\zs#!.*" display
-endif
-syn match	vimShebang	"\%^#!.*" display
-
-syn match	vimContinue		"^\s*\zs\\"
-syn match	vimContinueComment	'^\s*\zs["#]\\ .*' extend
-syn match	vim9ContinueComment	"^\s*\zs#\\ .*"	 extend
-syn cluster	vimContinue	contains=vimContinue,vimContinueComment
-syn cluster	vim9Continue	contains=vimContinue,vim9ContinueComment
-
-syn region	vimString	start='^\s*\\"' end='"' oneline keepend contains=@vimStringGroup,vimContinue
-syn region	vimString	start="^\s*\\'" end="'" oneline keepend contains=vimQuoteEscape,vimContinue
-
-syn match	vimCommentTitleLeader	'"\s\+'ms=s+1	contained
-syn match	vim9CommentTitleLeader	'#\s\+'ms=s+1	contained
-
-" Searches And Globals: {{{2
-" ====================
-VimL syn match	vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
-syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
-Vim9 syn match	vim9Search	'^\s*:[/?].*'		contains=vim9SearchDelim
-syn match	vim9SearchDelim	'^\s*\zs:[/?]\|[/?]$'	contained contains=vimCmdSep
-syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
-syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
-
-" Vim9 script Regions: {{{2
-" ==================
-
-if s:vim9script
-  syn cluster vimLegacyTop	contains=TOP,vim9LegacyHeader,vim9Comment,vim9LineComment
-  VimFoldH syn region vim9LegacyHeader start="\%^" end="^\ze\s*vim9s\%[cript]\>" contains=@vimLegacyTop,vimComment,vimLineComment
-
-  syn keyword vim9Vim9ScriptArg	noclear contained
-  syn keyword vim9Vim9Script	vim9s[cript] nextgroup=vim9Vim9ScriptArg skipwhite
-endif
-
-" Synchronize (speed) {{{2
-"============
-
-exe "syn sync minlines=" .. get(g:, "vimsyn_minlines", 100)
-exe "syn sync maxlines=" .. get(g:, "vimsyn_maxlines", 200)
-
-syn sync linecont	"^\s\+\\"
-syn sync linebreaks=2
-syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
-
-" ====================
-" Highlighting Settings {{{2
-" ====================
-
-if !exists("skip_vim_syntax_inits")
- if !exists("g:vimsyn_noerror")
-  hi def link vimBehaveError	vimError
-  hi def link vimCollClassErr	vimError
-  hi def link vimErrSetting	vimError
-  hi def link vimFTError	vimError
-  hi def link vimFunctionError	vimError
-  hi def link vimFunc         	vimError
-  hi def link vim9Func         	vimError
-  hi def link vimHiAttribList	vimError
-  hi def link vimHiCtermError	vimError
-  hi def link vimHiKeyError	vimError
-  hi def link vimMapModErr	vimError
-  hi def link vimMarkArgError	vimError
-  hi def link vimShebangError	vimError
-  hi def link vimSortOptionsError	Error
-  hi def link vimSubstFlagErr	vimError
-  hi def link vimSynCaseError	vimError
-  hi def link vimSyncError	vimError
-  hi def link vimSynConcealError	vimError
-  hi def link vimSynError	vimError
-  hi def link vimSynFoldlevelError	vimError
-  hi def link vimSynIskeywordError	vimError
-  hi def link vimSynSpellError	vimError
-  hi def link vimBufnrWarn	vimWarn
-
-  hi def link vim9TypeAliasError	vimError
- endif
-
- hi def link vimAbb	vimCommand
- hi def link vimAddress	vimMark
- hi def link vimAt	vimCommand
- hi def link vimAtArg	Special
- hi def link vimAugroupBang	vimBang
- hi def link vimAugroupError	vimError
- hi def link vimAugroupKey	vimCommand
- hi def link vimAutocmd	vimCommand
- hi def link vimAutocmdBang	vimBang
- hi def link vimAutocmdPatternEscape	Special
- hi def link vimAutoEvent	Type
- hi def link vimAutoEventGlob	Type
- hi def link vimAutocmdBufferPattern	Special
- hi def link vimAutocmdMod	Special
- hi def link vimAutocmdPatternSep	vimSep
- hi def link vimBang	vimOper
- hi def link vimBehaveBang	vimBang
- hi def link vimBehaveModel	vimBehave
- hi def link vimBehave	vimCommand
- hi def link vimBracket	Delimiter
- hi def link vimBreakaddFunc	Special
- hi def link vimBreakaddFile	Special
- hi def link vimBreakaddHere	Special
- hi def link vimBreakaddExpr	Special
- hi def link vimBreakpointGlob	Special
- hi def link vimBreakadd	vimCommand
- hi def link vimBreakdel	vimCommand
- hi def link vimBreaklist	vimCommand
- hi def link vimCall	vimCommand
- hi def link vimCatch	vimCommand
- hi def link vimCd	vimCommand
- hi def link vimCdBang	vimBang
- hi def link vimCmplxRepeat	SpecialChar
- hi def link vimCommand	Statement
- hi def link vimCommandModifier	vimCommand
- hi def link vimCommandModifierBang	vimBang
- hi def link vimComment	Comment
- hi def link vimCommentError	vimError
- hi def link vimCommentString	vimString
- hi def link vimCommentTitle	PreProc
- hi def link vimCondHL	vimCommand
- hi def link vimConst	vimCommand
- hi def link vimContinue	Special
- hi def link vimContinueComment	vimComment
- hi def link vimContinueString	vimString
- hi def link vimCount	Number
- hi def link vimCtrlChar	SpecialChar
- hi def link vimDebug	vimCommand
- hi def link vimDebuggreedy	vimCommand
- hi def link vimDef	vimCommand
- hi def link vimDefBang	vimBang
- hi def link vimDefComment	vim9Comment
- hi def link vimDefer	vimCommand
- hi def link vimDefParam	vimVar
- hi def link vimDelcommand	vimCommand
- hi def link vimDelcommandAttr	vimUserCmdAttr
- hi def link vimDelfunction	vimCommand
- hi def link vimDelfunctionBang	vimBang
- hi def link vimDoautocmd	vimCommand
- hi def link vimDoautocmdMod	Special
- hi def link vimDoCommand	vimCommand
- hi def link vimDoCommandBang	vimBang
- hi def link vimEcho	vimCommand
- hi def link vimEchohlNone	vimGroup
- hi def link vimEchohl	vimCommand
- hi def link vimElse	vimCommand
- hi def link vimElseIfErr	Error
- hi def link vimEndfunction	vimCommand
- hi def link vimEnddef	vimCommand
- hi def link vimEndif	vimCommand
- hi def link vimEnvvar	PreProc
- hi def link vimError	Error
- hi def link vimEscape	Special
- hi def link vimEval	vimCommand
- hi def link vimExFilter	vimCommand
- hi def link vimExFilterBang	vimBang
- hi def link vimExMark	vimCommand
- hi def link vimFBVar	vimVar
- hi def link vimFgBgAttrib	vimHiAttrib
- hi def link vimFuncEcho	vimCommand
- hi def link vimFor	vimCommand
- hi def link vimForInContinue	vimContinue
- hi def link vimForInContinueComment	vimContinueComment
- hi def link vimFTCmd	vimCommand
- hi def link vimFTOption	vimSynType
- hi def link vimFunction	vimCommand
- hi def link vimFunctionBang	vimBang
- hi def link vimFunctionComment	vimComment
- hi def link vimFuncName	Function
- hi def link vimFunctionMod	Special
- hi def link vimFunctionParam	vimVar
- hi def link vimFunctionParamEquals	vimOper
- hi def link vimFunctionScope	vimVarScope
- hi def link vimFunctionSID	vimNotation
- hi def link vimGrep	vimCommand
- hi def link vimGrepadd	vimCommand
- hi def link vimGrepBang	vimBang
- hi def link vimGroup	Type
- hi def link vimGroupAdd	vimSynOption
- hi def link vimGroupListEquals	vimSynOption
- hi def link vimGroupListContinue		vimContinue
- hi def link vimGroupListContinueComment	vimContinueComment
- hi def link vimGroupName	Normal
- hi def link vimGroupRem	vimSynOption
- hi def link vimGroupSpecial	Special
- hi def link vimHelp	vimCommand
- hi def link vimHelpBang	vimBang
- hi def link vimHelpgrep	vimCommand
- hi def link vimHiAttrib	PreProc
- hi def link vimHiBang	vimBang
- hi def link vimHiClear	Type
- hi def link vimHiCtermColor	Constant
- hi def link vimHiCtermFgBg	vimHiTerm
- hi def link vimHiCtermfont	vimHiTerm
- hi def link vimHiCtermul	vimHiTerm
- hi def link vimHiCTerm	vimHiTerm
- hi def link vimHighlight	vimCommand
- hi def link vimHiGroup	vimGroupName
- hi def link vimHiGuiFgBg	vimHiTerm
- hi def link vimHiGuiFont	vimHiTerm
- hi def link vimHiGuiRgb	vimNumber
- hi def link vimHiGui	vimHiTerm
- hi def link vimHiNmbr	Number
- hi def link vimHiNone	vimGroup
- hi def link vimHiStartStop	vimHiTerm
- hi def link vimHiTerm	Type
- hi def link vimHLGroup	vimGroup
- hi def link vimHistory	vimCommand
- hi def link vimHistoryName	Special
- hi def link vimImport	vimCommand
- hi def link vimImportAutoload	Special
- hi def link vimImportAs	vimImport
- hi def link vimInsert	vimString
- hi def link vim9KeymapLineComment	vimKeymapLineComment
- hi def link vimKeymapLineComment	vimComment
- hi def link vimKeymapTailComment	vimComment
- hi def link vimLambdaBrace	Delimiter
- hi def link vimLambdaOperator	vimOper
- hi def link vimLanguage	vimCommand
- hi def link vimLanguageCategory	Special
- hi def link vimLanguageNameReserved	Constant
- hi def link vimLet	vimCommand
- hi def link vimLetHeredoc	vimString
- hi def link vimLetHeredocStart	Special
- hi def link vimLetHeredocStop	Special
- hi def link vimLetRegister	vimRegister
- hi def link vimLineComment	vimComment
- hi def link vimLua	vimCommand
- hi def link vimMake	vimCommand
- hi def link vimMakeadd	vimCommand
- hi def link vimMakeBang	vimBang
- hi def link vimMapBang	vimBang
- hi def link vimMapLeader	vimBracket
- hi def link vimMapLeaderKey	vimNotation
- hi def link vimMapModKey	vimFunctionSID
- hi def link vimMapMod	vimBracket
- hi def link vimMap	vimCommand
- hi def link vimMark	Number
- hi def link vimMarkNumber	vimNumber
- hi def link vimMatch	vimCommand
- hi def link vimMatchGroup	vimGroup
- hi def link vimMatchNone	vimGroup
- hi def link vimMenuBang	vimBang
- hi def link vimMenuClear	Special
- hi def link vimMenuMod	vimMapMod
- hi def link vimMenuName	PreProc
- hi def link vimMenu	vimCommand
- hi def link vimMenuNotation	vimNotation
- hi def link vimMenuPriority	Number
- hi def link vimMenuStatus	Special
- hi def link vimMenutranslateComment	vimComment
- hi def link vim9MethodName	vimFuncName
- hi def link vimMtchComment	vimComment
- hi def link vimMzScheme	vimCommand
- hi def link vimNonText	NonText
- hi def link vimNormal	vimCommand
- hi def link vimNotation	Special
- hi def link vimNotFunc	vimCommand
- hi def link vimNotPatSep	vimString
- hi def link vimNumber	Number
- hi def link vimOperError	Error
- hi def link vimOper	Operator
- hi def link vimOperContinue	vimContinue
- hi def link vimOperContinueComment	vimContinueComment
- hi def link vimOption	PreProc
- hi def link vimOptionVar	Identifier
- hi def link vimOptionVarName	Identifier
- hi def link vimParenSep	Delimiter
- hi def link vimPatSepErr	vimError
- hi def link vimPatSepR	vimPatSep
- hi def link vimPatSep	SpecialChar
- hi def link vimPatSepZone	vimString
- hi def link vimPatSepZ	vimPatSep
- hi def link vimPattern	Type
- hi def link vimPerl	vimCommand
- hi def link vimPlainMark	vimMark
- hi def link vimProfile	vimCommand
- hi def link vimProfileArg	vimSpecial
- hi def link vimProfileBang	vimBang
- hi def link vimProfdel	vimCommand
- hi def link vimProfdelArg	vimSpecial
- hi def link vimPrompt	vimCommand
- hi def link vimPython	vimCommand
- hi def link vimPython3	vimCommand
- hi def link vimPythonX	vimCommand
- hi def link vimQuoteEscape	vimEscape
- hi def link vimRedir	vimCommand
- hi def link vimRedirBang	vimBang
- hi def link vimRedirFileOperator	vimOper
- hi def link vimRedirRegisterOperator	vimOper
- hi def link vimRedirVariableOperator	vimOper
- hi def link vimRedirEnd	Special
- hi def link vimRedirRegister	vimRegister
- hi def link vimRegister	SpecialChar
- hi def link vimRuby	vimCommand
- hi def link vimScriptDelim	Comment
- hi def link vimScriptHeredocStart	vimLetHeredocStart
- hi def link vimScriptHeredocStop	vimLetHeredocStop
- hi def link vimSearch	vimString
- hi def link vimSearchDelim	Delimiter
- hi def link vimSep	Delimiter
- hi def link vimSet	vimCommand
- hi def link vimSetAll	vimOption
- hi def link vimSetBang	vimBang
- hi def link vimSetComment	vimComment
- hi def link vimSetMod	vimOption
- hi def link vimSetSep	vimSep
- hi def link vimSetTermcap	vimOption
- hi def link vimShebang	PreProc
- hi def link vimSleep	vimCommand
- hi def link vimSleepArg	Constant
- hi def link vimSleepBang	vimBang
- hi def link vimSort	vimCommand
- hi def link vimSortBang	vimBang
- hi def link vimSortOptions	Special
- hi def link vimSpecFile	Identifier
- hi def link vimSpecFileMod	vimSpecFile
- hi def link vimSpecial	Type
- hi def link vimStringCont	vimString
- hi def link vimString	String
- hi def link vimStringEnd	vimString
- hi def link vimStringInterpolationBrace	vimEscape
- hi def link vimSubst1	vimSubst
- hi def link vimSubstCount	Number
- hi def link vimSubstDelim	Delimiter
- hi def link vimSubstFlags	Special
- hi def link vimSubstSubstr	SpecialChar
- hi def link vimSubstTwoBS	vimString
- hi def link vimSubst	vimCommand
- hi def link vimSynCase	Type
- hi def link vimSyncCcomment	Type
- hi def link vimSynCchar	vimSynOption
- hi def link vimSynCcharValue	Character
- hi def link vimSyncClear	Type
- hi def link vimSyncFromstart	Type
- hi def link vimSyncGroup	vimGroupName
- hi def link vimSyncGroupName	vimGroupName
- hi def link vimSyncKey	Type
- hi def link vimSyncLinebreak	Type
- hi def link vimSyncLinecont	Type
- hi def link vimSyncLines	Type
- hi def link vimSyncMatch	Type
- hi def link vimSyncNone	Type
- hi def link vimSynConceal	Type
- hi def link vimSynContains	vimSynOption
- hi def link vimSyncRegion	Type
- hi def link vimSynFoldlevel	Type
- hi def link vimSynIskeyword	Type
- hi def link vimSynIskeywordSep	Delimiter
- hi def link vimSynContainedin	vimSynContains
- hi def link vimSynKeyOpt	vimSynOption
- hi def link vimSynMtchGrp	vimSynOption
- hi def link vimSynMtchOpt	vimSynOption
- hi def link vimSynNextgroup	vimSynOption
- hi def link vimSynNotPatRange	vimSynRegPat
- hi def link vimSynOption	Special
- hi def link vimSynPatRange	vimString
- hi def link vimSynReg	Type
- hi def link vimSynRegOpt	vimSynOption
- hi def link vimSynRegPat	vimString
- hi def link vimSynSpell	Type
- hi def link vimSyntax	vimCommand
- hi def link vimSynType	vimSpecial
- hi def link vimSyntime	vimCommand
- hi def link vimSyntimeArg	vimSpecial
- hi def link vimTcl	vimCommand
- hi def link vimTerminal	vimCommand
- hi def link vimTerminalContinue	vimContinue
- hi def link vimTerminalContinueComment	vimContinueComment
- hi def link vimTerminalOption		vimSpecial
- hi def link vimTerminalKillOptionArg	Constant
- hi def link vimTerminalSizeOptionArg	Constant
- hi def link vimTerminalTypeOptionArg	Constant
- hi def link vimThrow	vimCommand
- hi def link vimTodo	Todo
- hi def link vimType	Type
- hi def link vimTypeAny	vimType
- hi def link vimTypeObject	vimType
- hi def link vimTypeObjectBracket	vimTypeObject
- hi def link vimUniq	vimCommand
- hi def link vimUniqBang	vimBang
- hi def link vimUniqOptions	Special
- hi def link vimUnlet	vimCommand
- hi def link vimUnletBang	vimBang
- hi def link vimUnmap	vimMap
- hi def link vimUserCmd	vimCommand
- hi def link vimUserCmdAttrAddr	vimSpecial
- hi def link vimUserCmdAttrComplete	vimSpecial
- hi def link vimUserCmdAttrCompleteFunc	vimVar
- hi def link vimUserCmdAttrNargs	vimSpecial
- hi def link vimUserCmdAttrRange	vimSpecial
- hi def link vimUserCmdAttrKey	vimUserCmdAttr
- hi def link vimUserCmdAttr	Special
- hi def link vimUserCmdAttrError	Error
- hi def link vimUserCmdError	Error
- hi def link vimUserCmdKey	vimCommand
- hi def link vimUserFunc	Normal
- hi def link vimVar	Normal
- hi def link vimVarScope	Identifier
- hi def link vimVimgrep	vimCommand
- hi def link vimVimgrepadd	vimCommand
- hi def link vimVimgrepBang	vimBang
- hi def link vimVimgrepFlags	Special
- hi def link vimVimVar	Identifier
- hi def link vimVimVarName	Identifier
- hi def link vimWarn	WarningMsg
- hi def link vimWildcard	Special
- hi def link vimWildcardBraceComma	vimWildcard
- hi def link vimWildcardBracket	vimWildcard
- hi def link vimWildcardBracketCaret	vimWildcard
- hi def link vimWildcardBracketCharacter	Normal
- hi def link vimWildcardBracketCharacter	Normal
- hi def link vimWildcardBracketCharacterClass	vimWildCard
- hi def link vimWildcardBracketCollatingSymbol	vimWildCard
- hi def link vimWildcardBracketEnd		vimWildcard
- hi def link vimWildcardBracketEquivalenceClass	vimWildCard
- hi def link vimWildcardBracketEscape	vimWildcard
- hi def link vimWildcardBracketHyphen	vimWildcard
- hi def link vimWildcardBracketRightBracket	vimWildcardBracketCharacter
- hi def link vimWildcardBracketStart	vimWildcard
- hi def link vimWildcardEscape	vimWildcard
- hi def link vimWildcardInterval	vimWildcard
- hi def link vimWildcardQuestion	vimWildcard
- hi def link vimWildcardStar	vimWildcard
- hi def link vimWinCmd	vimCommand
-
- hi def link vim9Abstract	vimCommand
- hi def link vim9Boolean	Boolean
- hi def link vim9Class	vimCommand
- hi def link vim9Comment	Comment
- hi def link vim9CommentError	vimError
- hi def link vim9CommentTitle	PreProc
- hi def link vim9ConstructorDefParam	vimVar
- hi def link vim9Const	vimCommand
- hi def link vim9ContinueComment	vimContinueComment
- hi def link vim9Enum	vimCommand
- hi def link vim9EnumImplementedInterfaceComment	vim9Comment
- hi def link vim9EnumImplements	vim9Implements
- hi def link vim9EnumNameComment	vim9Comment
- hi def link vim9EnumNameContinue	vimContinue
- hi def link vim9EnumNameContinueComment	vim9Comment
- hi def link vim9EnumValueListCommaComment	vim9Comment
- hi def link vim9Export	vimCommand
- hi def link vim9Extends	Keyword
- hi def link vim9Final	vimCommand
- hi def link vim9For	vimCommand
- hi def link vim9ForInComment	vim9Comment
- hi def link vim9Implements	Keyword
- hi def link vim9AbstractDef	vimCommand
- hi def link vim9Interface	vimCommand
- hi def link vim9LambdaOperator	vimOper
- hi def link vim9LambdaOperatorComment	vim9Comment
- hi def link vim9LambdaParen	vimParenSep
- hi def link vim9LhsRegister	vimLetRegister
- hi def link vim9LhsVariable	vimVar
- hi def link vim9LineComment	vimComment
- hi def link vim9MethodDef	vimCommand
- hi def link vim9MethodDefComment	vimDefComment
- hi def link vim9MethodNameError	vimFunctionError
- hi def link vim9Null	Constant
- hi def link vim9Public	vimCommand
- hi def link vim9Search	vimString
- hi def link vim9SearchDelim	Delimiter
- hi def link vim9Static	vimCommand
- hi def link vim9Super	Identifier
- hi def link vim9This	Identifier
- hi def link vim9Type	vimCommand
- hi def link vim9TypeEquals	vimOper
- hi def link vim9Variable	vimVar
- hi def link vim9VariableType	vimType
- hi def link vim9VariableTypeAny	vimTypeAny
- hi def link vim9VariableTypeObject	vimTypeObject
- hi def link vim9VariableTypeObjectBracket	vimTypeObjectBracket
- hi def link vim9Var	vimCommand
- hi def link vim9Vim9ScriptArg	Special
- hi def link vim9Vim9Script	vimCommand
-
- hi def link vimCompilerSet	vimCommand
- hi def link vimSynColor vimCommand
- hi def link vimSynLink vimCommand
- hi def link vimSynMenu	vimCommand
- hi def link vimSynMenuPath	vimMenuName
-endif
-
-" Current Syntax Variable: {{{2
-let b:current_syntax = "vim"
-
-" ---------------------------------------------------------------------
-" Cleanup: {{{1
-delc Vim9
-delc VimL
-delc VimFolda
-delc VimFoldc
-delc VimFolde
-delc VimFoldf
-delc VimFoldh
-delc VimFoldH
-delc VimFoldi
-delc VimFoldl
-delc VimFoldm
-delc VimFoldp
-delc VimFoldP
-delc VimFoldr
-delc VimFoldt
-let &cpo = s:keepcpo
-unlet s:keepcpo s:vim9script
-" vim:ts=18 fdm=marker ft=vim
diff --git a/uvim/runtime/syntax/gift.vim b/uvim/runtime/syntax/gift.mnv
index 3f8d631ec0..465bc1a161 100644
--- a/uvim/runtime/syntax/gift.vim
+++ b/uvim/runtime/syntax/gift.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:        Moodle GIFT (General Import Format Template)
 " Maintainer:      Selim Temizer (http://selimtemizer.com)
diff --git a/uvim/runtime/syntax/git.vim b/uvim/runtime/syntax/git.mnv
index 51eb8127dd..5673b9f70d 100644
--- a/uvim/runtime/syntax/git.vim
+++ b/uvim/runtime/syntax/git.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	generic git output
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Last Change:	2023 Dec 28
 
 if exists("b:current_syntax")
@@ -10,7 +10,7 @@ endif
 syn case match
 syn sync minlines=50
 
-syn include @gitDiff syntax/diff.vim
+syn include @gitDiff syntax/diff.mnv
 
 syn region gitHead start=/\%^\%(tag \|tree \|object \)\@=/ end=/^$/ contains=@NoSpell
 syn region gitHead start=/\%(^commit\%( \x\{4,\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/ contains=@NoSpell
diff --git a/uvim/runtime/syntax/gitattributes.vim b/uvim/runtime/syntax/gitattributes.mnv
index b6d997f45d..81f9139431 100644
--- a/uvim/runtime/syntax/gitattributes.vim
+++ b/uvim/runtime/syntax/gitattributes.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git attributes
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	.gitattributes, *.git/info/attributes
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Comment
 syn keyword gitattributesTodo contained TODO FIXME XXX
diff --git a/uvim/runtime/syntax/gitcommit.vim b/uvim/runtime/syntax/gitcommit.mnv
index bce6772762..1b60cd5684 100644
--- a/uvim/runtime/syntax/gitcommit.vim
+++ b/uvim/runtime/syntax/gitcommit.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git commit file
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	*.git/COMMIT_EDITMSG
 " Last Change:	2023 Dec 28
 
@@ -18,7 +18,7 @@ if has("spell")
   syn spell toplevel
 endif
 
-syn include @gitcommitDiff syntax/diff.vim
+syn include @gitcommitDiff syntax/diff.mnv
 syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@gitcommitDiff
 
 if get(g:, 'gitcommit_summary_length') < 0
diff --git a/uvim/runtime/syntax/gitconfig.vim b/uvim/runtime/syntax/gitconfig.mnv
index e5eaf10f94..c35e95b5e0 100644
--- a/uvim/runtime/syntax/gitconfig.vim
+++ b/uvim/runtime/syntax/gitconfig.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git config file
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	gitconfig, .gitconfig, *.git/config
 " Last Change:	2019 Dec 05
 
diff --git a/uvim/runtime/syntax/gitignore.vim b/uvim/runtime/syntax/gitignore.mnv
index 8e6d098acd..7559ee0cc4 100644
--- a/uvim/runtime/syntax/gitignore.vim
+++ b/uvim/runtime/syntax/gitignore.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git ignore
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	.gitignore, *.git/info/exclude
diff --git a/uvim/runtime/syntax/gitolite.vim b/uvim/runtime/syntax/gitolite.mnv
index 3a6da26cc6..d0e8936705 100644
--- a/uvim/runtime/syntax/gitolite.vim
+++ b/uvim/runtime/syntax/gitolite.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	gitolite configuration
-" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/vim/syntax/gitolite.vim
-"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/syntax/gitolite.vim)
+" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/mnv/syntax/gitolite.mnv
+"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/mnv/syntax/gitolite.mnv)
 " Maintainer:	Sitaram Chamarty <sitaramc@gmail.com>
 " (former Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>)
 " Last Change:	2017 Oct 05
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " this seems to be the best way, for now.
 syntax sync fromstart
diff --git a/uvim/runtime/syntax/gitrebase.vim b/uvim/runtime/syntax/gitrebase.mnv
index 13f157b005..8752c72f1a 100644
--- a/uvim/runtime/syntax/gitrebase.vim
+++ b/uvim/runtime/syntax/gitrebase.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git rebase --interactive
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	git-rebase-todo
 " Last Change:	2022 Jan 05
 
diff --git a/uvim/runtime/syntax/gitsendemail.vim b/uvim/runtime/syntax/gitsendemail.mnv
index 8fdf6839c8..3890e26405 100644
--- a/uvim/runtime/syntax/gitsendemail.vim
+++ b/uvim/runtime/syntax/gitsendemail.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	git send-email message
 " Maintainer:	Tim Pope
 " Filenames:	.gitsendemail.*
@@ -8,9 +8,9 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/mail.vim
+runtime! syntax/mail.mnv
 unlet! b:current_syntax
-syn include @gitsendemailDiff syntax/diff.vim
+syn include @gitsendemailDiff syntax/diff.mnv
 syn region gitsendemailDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^-- %/ fold contains=@gitsendemailDiff
 
 syn case match
diff --git a/uvim/runtime/syntax/gkrellmrc.vim b/uvim/runtime/syntax/gkrellmrc.mnv
index f005ca2dc8..bbce36ddf5 100644
--- a/uvim/runtime/syntax/gkrellmrc.vim
+++ b/uvim/runtime/syntax/gkrellmrc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: gkrellm theme files `gkrellmrc'
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2003-04-30
-" URL: http://trific.ath.cx/Ftp/vim/syntax/gkrellmrc.vim
+" URL: http://trific.ath.cx/Ftp/mnv/syntax/gkrellmrc.mnv
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/gleam.vim b/uvim/runtime/syntax/gleam.mnv
index e89ab564e9..55105269b4 100644
--- a/uvim/runtime/syntax/gleam.vim
+++ b/uvim/runtime/syntax/gleam.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Gleam
 " Maintainer:  Kirill Morozov <kirill@robotix.pro>
-" Based On:    https://github.com/gleam-lang/gleam.vim
+" Based On:    https://github.com/gleam-lang/gleam.mnv
 " Last Change: 2025 Apr 20
 " 2025 May 15 Add @Spell clusters #17324
 
@@ -95,4 +95,4 @@ highlight link gleamString String
 highlight link gleamTodo Todo
 highlight link gleamType Type
 
-" vim: sw=2 sts=2 et
+" mnv: sw=2 sts=2 et
diff --git a/uvim/runtime/syntax/glimmer.vim b/uvim/runtime/syntax/glimmer.mnv
index 67555db857..6eae36d08e 100644
--- a/uvim/runtime/syntax/glimmer.vim
+++ b/uvim/runtime/syntax/glimmer.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Glimmer
 " Maintainer:   Devin Weaver
 " Last Change:  2026 Feb 20
-" Origin:       https://github.com/joukevandermaas/vim-ember-hbs
+" Origin:       https://github.com/joukevandermaas/mnv-ember-hbs
 " Credits:      Jouke van der Maas
-" License:      Same as Vim
+" License:      Same as MNV
 
-" Vim detects GJS/GTS files as {java,type}script.glimmer
-" Vim will read the javascript/typescript syntax files first and set
+" MNV detects GJS/GTS files as {java,type}script.glimmer
+" MNV will read the javascript/typescript syntax files first and set
 " b:current_syntax accordingly then it will read the glimmer syntax file.
 " This is why we use b:current_syntax to make sure we are in the correct state
 " to continue.
@@ -20,9 +20,9 @@ let base_syntax = b:current_syntax
 unlet! b:current_syntax
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-syntax include @hbs syntax/handlebars.vim
+syntax include @hbs syntax/handlebars.mnv
 
 if base_syntax == "javascript"
   syntax region glimmerTemplateBlock
@@ -32,7 +32,7 @@ if base_syntax == "javascript"
 
   let b:current_syntax = "javascript.glimmer"
 else
-  " syntax/typescript.vim adds typescriptTypeCast which is in conflict with
+  " syntax/typescript.mnv adds typescriptTypeCast which is in conflict with
   " <template> typescriptreact doesn't define it but we want to not include
   " the JSX syntax.
   syntax clear typescriptTypeCast
diff --git a/uvim/runtime/syntax/glsl.vim b/uvim/runtime/syntax/glsl.mnv
index 06ffcba625..e2b528c5a0 100644
--- a/uvim/runtime/syntax/glsl.vim
+++ b/uvim/runtime/syntax/glsl.mnv
@@ -1,7 +1,7 @@
 " Language: OpenGL Shading Language
 " Maintainer: Gregory Anders <greg@gpanders.com>
 " Last Modified: 2024 Jul 21
-" Upstream: https://github.com/tikhomirov/vim-glsl
+" Upstream: https://github.com/tikhomirov/mnv-glsl
 
 if exists('b:current_syntax')
   finish
diff --git a/uvim/runtime/syntax/gnash.vim b/uvim/runtime/syntax/gnash.mnv
index cce522dd86..e676f6d638 100644
--- a/uvim/runtime/syntax/gnash.vim
+++ b/uvim/runtime/syntax/gnash.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Maintainer: 	Thilo Six
-" Contact:	<vim-dev at vim dot org>
-"		http://www.vim.org/maillist.php#vim-dev
+" Contact:	<mnv-dev at mnv dot org>
+"		http://www.mnv.org/maillist.php#mnv-dev
 "
 " Description: 	highlight gnash configuration files
 "		http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc
-" File:		runtime/syntax/gnash.vim
+" File:		runtime/syntax/gnash.mnv
 " Last Change: 	2012 May 19
-" Modeline:	vim: ts=8:sw=2:sts=2:
+" Modeline:	mnv: ts=8:sw=2:sts=2:
 "
-" Credits:	derived from Nikolai Weibulls readline.vim
+" Credits:	derived from Nikolai Weibulls readline.mnv
 "
-" License:	VIM License
-"		Vim is Charityware, see ":help Uganda"
+" License:	MNV License
+"		MNV is Charityware, see ":help Uganda"
 "
 
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/gnuplot.vim b/uvim/runtime/syntax/gnuplot.mnv
index b5092d7555..e9b538548f 100644
--- a/uvim/runtime/syntax/gnuplot.vim
+++ b/uvim/runtime/syntax/gnuplot.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	gnuplot 4.7.0
 " Maintainer:	Josh Wainwright <wainwright DOT ja AT gmail DOT com>
 " Last Maintainer:	Andrew Rasmussen andyras@users.sourceforge.net
@@ -6,20 +6,20 @@
 " Last Change:	2021 Nov 16
 " 		additional changes from PR #8949
 " Filenames:	*.gnu *.plt *.gpi *.gih *.gp *.gnuplot scripts: #!*gnuplot
-" URL:		http://www.vim.org/scripts/script.php?script_id=4873
-" Original URL:	http://johnh51.get.to/vim/syntax/gnuplot.vim
+" URL:		http://www.mnv.org/scripts/script.php?script_id=4873
+" Original URL:	http://johnh51.get.to/mnv/syntax/gnuplot.mnv
 
 " thanks to "David Necas (Yeti)" <yeti@physics.muni.cz>
 
 " credit also to Jim Eberle <jim.eberle@fastnlight.com>
-" for the script http://www.vim.org/scripts/script.php?script_id=1737
+" for the script http://www.mnv.org/scripts/script.php?script_id=1737
 
 " some shortened names to make demo files look clean... jeh. 11/2000
 " demos -> 3.8i ... jeh. 5/2003 - a work in progress...
 " added current commands, keywords, variables, todos, macros... amr 2014-02-24
 
-" For vim version 5.x: Clear all syntax items
-" For vim version 6.x: Quit when a syntax file was already loaded
+" For mnv version 5.x: Clear all syntax items
+" For mnv version 6.x: Quit when a syntax file was already loaded
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -101,7 +101,7 @@ syn keyword gnuplotNumber	STATS_index_max_y STATS_correlation STATS_sumxy
 syn keyword gnuplotError	FIT_LIMIT FIT_MAXITER FIT_START_LAMBDA
 syn keyword gnuplotError	FIT_LAMBDA_FACTOR FIT_LOG FIT_SCRIPT
 
-" numbers, from c.vim
+" numbers, from c.mnv
 
 " integer number, or floating point number without a dot and with "f".
 syn case    ignore
@@ -546,4 +546,4 @@ hi def link gnuplotTodo		Todo
 
 let b:current_syntax = "gnuplot"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/go.vim b/uvim/runtime/syntax/go.mnv
index feed9646fb..ceecb5a966 100644
--- a/uvim/runtime/syntax/go.vim
+++ b/uvim/runtime/syntax/go.mnv
@@ -2,13 +2,13 @@
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
 "
-" go.vim: Vim syntax file for Go.
+" go.mnv: MNV syntax file for Go.
 " Language:             Go
 " Maintainer:           Billie Cleek <bhcleek@gmail.com>
 " Latest Revision:      2024-04-13
-"  2024-03-17:          - fix goPackageComment highlight (by Vim Project)
+"  2024-03-17:          - fix goPackageComment highlight (by MNV Project)
 " License:              BSD-style. See LICENSE file in source repository.
-" Repository:           https://github.com/fatih/vim-go
+" Repository:           https://github.com/fatih/mnv-go
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 function! s:FoldEnable(...) abort
   if a:0 > 0
@@ -138,7 +138,7 @@ syn keyword     goPredefinedIdentifiers    nil iota
 
 hi def link     goBuiltins                 Identifier
 hi def link     goPredefinedIdentifiers    Constant
-" Boolean links to Constant by default by vim: goBoolean and goPredefinedIdentifiers
+" Boolean links to Constant by default by mnv: goBoolean and goPredefinedIdentifiers
 " will be highlighted the same, but having the separate groups allows users to
 " have separate highlighting for them if they desire.
 hi def link     goBoolean                  Boolean
@@ -375,7 +375,7 @@ hi def link     goSpaceError        Error
 
 
 
-" included from: https://github.com/athom/more-colorful.vim/blob/master/after/syntax/go.vim
+" included from: https://github.com/athom/more-colorful.mnv/blob/master/after/syntax/go.mnv
 "
 " Comments; their contents
 syn keyword     goTodo              contained NOTE
@@ -558,4 +558,4 @@ let b:current_syntax = "go"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: sw=2 sts=2 et
+" mnv: sw=2 sts=2 et
diff --git a/uvim/runtime/syntax/goaccess.vim b/uvim/runtime/syntax/goaccess.mnv
index 4ca8f6d921..28c682a6dd 100644
--- a/uvim/runtime/syntax/goaccess.vim
+++ b/uvim/runtime/syntax/goaccess.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: GoAccess configuration
 " Maintainer: Adam Monsen <haircut@gmail.com>
 " Last Change: 2024 Aug 1
diff --git a/uvim/runtime/syntax/godoc.vim b/uvim/runtime/syntax/godoc.mnv
index 0603f51c83..c052bd3ae9 100644
--- a/uvim/runtime/syntax/godoc.vim
+++ b/uvim/runtime/syntax/godoc.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Godoc (generated documentation for go)
-" Maintainer:	David Barnett (https://github.com/google/vim-ft-go)
+" Maintainer:	David Barnett (https://github.com/google/mnv-ft-go)
 " Last Change:	2014 Aug 16
 
 if exists('b:current_syntax')
@@ -16,4 +16,4 @@ hi def link godocTitle Title
 
 let b:current_syntax = 'godoc'
 
-" vim: sw=2 sts=2 et
+" mnv: sw=2 sts=2 et
diff --git a/uvim/runtime/syntax/gp.vim b/uvim/runtime/syntax/gp.mnv
index 89f2d3f0ff..fc0509fda8 100644
--- a/uvim/runtime/syntax/gp.vim
+++ b/uvim/runtime/syntax/gp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	gp (version 2.15)
 " Maintainer:	Karim Belabas <Karim.Belabas@math.u-bordeaux.fr>
 " Last change:	2023 Aug 22
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " control statements
 syntax keyword gpStatement	break return next
@@ -85,4 +85,4 @@ hi def link gpArgs		Type
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/gpg.vim b/uvim/runtime/syntax/gpg.mnv
index f132a52705..416ba58927 100644
--- a/uvim/runtime/syntax/gpg.vim
+++ b/uvim/runtime/syntax/gpg.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		gpg(1) configuration file
 " Maintainer: This runtime file is looking for a maintainer.
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/gprof.vim b/uvim/runtime/syntax/gprof.mnv
index d2c5cb4cab..0db371ae48 100644
--- a/uvim/runtime/syntax/gprof.vim
+++ b/uvim/runtime/syntax/gprof.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Syntax for Gprof Output
 " Maintainer: Dominique Pelle <dominique.pelle@gmail.com>
 " Last Change: 2021 Sep 19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn spell notoplevel
 syn case match
diff --git a/uvim/runtime/syntax/grads.vim b/uvim/runtime/syntax/grads.mnv
index 50be14bb22..103b7db8a0 100644
--- a/uvim/runtime/syntax/grads.vim
+++ b/uvim/runtime/syntax/grads.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	grads (GrADS scripts)
 " Maintainer:	Stefan Fronzek (sfronzek at gmx dot net)
 " Last change: 13 Feb 2004
diff --git a/uvim/runtime/syntax/graphql.vim b/uvim/runtime/syntax/graphql.mnv
index 01d5ca25ff..16011982c9 100644
--- a/uvim/runtime/syntax/graphql.vim
+++ b/uvim/runtime/syntax/graphql.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	graphql
 " Maintainer:	Jon Parise <jon@indelible.org>
 " Filenames:	*.graphql *.graphqls *.gql
-" URL:		https://github.com/jparise/vim-graphql
+" URL:		https://github.com/jparise/mnv-graphql
 " License:	MIT <https://opensource.org/license/mit>
 " Last Change:	2024 Dec 21
 
diff --git a/uvim/runtime/syntax/gretl.vim b/uvim/runtime/syntax/gretl.mnv
index 671142a9ea..dce9f7d34d 100644
--- a/uvim/runtime/syntax/gretl.vim
+++ b/uvim/runtime/syntax/gretl.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	gretl (http://gretl.sf.net)
 " Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
 " Last Change:  2006 Apr 30
 " Filenames:	*.inp *.gretl
-" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
+" URL:	http://uosis.mif.vu.lt/~zemlys/mnv-syntax/gretl.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -82,4 +82,4 @@ hi def link gArrow	       Repeat
 
 let b:current_syntax="gretl"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/groff.vim b/uvim/runtime/syntax/groff.mnv
index c076c8d973..5ca5f4d05f 100644
--- a/uvim/runtime/syntax/groff.vim
+++ b/uvim/runtime/syntax/groff.mnv
@@ -1,10 +1,10 @@
-" VIM syntax file
+" MNV syntax file
 " Language:	groff
 " Maintainer:	John Marshall <jmarshall@hey.com>
 " Previous Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
 " Last Change:	2003-05-08-12:41:13 GMT-5.
 
-" This uses the nroff.vim syntax file.
+" This uses the nroff.mnv syntax file.
 let b:main_syntax = "nroff"
 let b:nroff_is_groff = 1
-runtime! syntax/nroff.vim
+runtime! syntax/nroff.mnv
diff --git a/uvim/runtime/syntax/groovy.vim b/uvim/runtime/syntax/groovy.mnv
index 3509401edb..ab2cd60ff6 100644
--- a/uvim/runtime/syntax/groovy.vim
+++ b/uvim/runtime/syntax/groovy.mnv
@@ -1,33 +1,33 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Groovy
 " Original Author:	Alessio Pace <billy.corgan AT tiscali.it>
-" Maintainer:	Tobias Rapp <yahuxo+vim AT mailbox.org>
+" Maintainer:	Tobias Rapp <yahuxo+mnv AT mailbox.org>
 " Version: 	0.1.18
-" URL:	  http://www.vim.org/scripts/script.php?script_id=945
+" URL:	  http://www.mnv.org/scripts/script.php?script_id=945
 " Last Change:	2021 Feb 03
-"               2025 Apr 27 by Vim Project correct Vim script spelling
+"               2025 Apr 27 by MNV Project correct MNV script spelling
 
 " THE ORIGINAL AUTHOR'S NOTES:
 "
-" This is my very first Vim script, I hope to have
+" This is my very first MNV script, I hope to have
 " done it the right way.
 "
-" I must directly or indirectly thank the author of java.vim and ruby.vim:
+" I must directly or indirectly thank the author of java.mnv and ruby.mnv:
 " I copied from them most of the stuff :-)
 "
-" Relies on html.vim
+" Relies on html.mnv
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 "
 " HOWTO USE IT (INSTALL) when not part of the distribution:
 "
-" 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
+" 1) copy the file in the (global or user's $HOME/.mnv/syntax/) syntax folder
 "
 " 2) add this line to recognize groovy files by filename extension:
 "
 " au BufNewFile,BufRead *.groovy  setf groovy
-" in the global vim filetype.vim file or inside $HOME/.vim/filetype.vim
+" in the global mnv filetype.mnv file or inside $HOME/.mnv/filetype.mnv
 "
 " 3) add this part to recognize by content groovy script (no extension needed :-)
 "
@@ -38,7 +38,7 @@
 "    setf groovy
 "  endif
 "
-"  in the global scripts.vim file or in $HOME/.vim/scripts.vim
+"  in the global scripts.mnv file or in $HOME/.mnv/scripts.mnv
 "
 " 4) open/write a .groovy file or a groovy script :-)
 "
@@ -55,10 +55,10 @@ if !exists("main_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " ##########################
-" Java stuff taken from java.vim
+" Java stuff taken from java.mnv
 " some characters that cannot be in a groovy program (outside a string)
 " syn match groovyError "[\\@`]"
 "syn match groovyError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
@@ -169,8 +169,8 @@ syn keyword groovyJDKMethods    subMap append asWritable eachByte eachLine eachF
 syn cluster groovyTop add=groovyJDKBuiltin,groovyJDKOperOverl,groovyJDKMethods
 
 " no useful I think, so I comment it..
-"if filereadable(expand("<sfile>:p:h")."/groovyid.vim")
- " source <sfile>:p:h/groovyid.vim
+"if filereadable(expand("<sfile>:p:h")."/groovyid.mnv")
+ " source <sfile>:p:h/groovyid.mnv
 "endif
 
 if exists("groovy_space_errors")
@@ -182,7 +182,7 @@ if exists("groovy_space_errors")
   endif
 endif
 
-" it is a better case construct than java.vim to match groovy syntax
+" it is a better case construct than java.mnv to match groovy syntax
 syn region  groovyLabelRegion     transparent matchgroup=groovyLabel start="\<case\>" matchgroup=NONE end=":\|$" contains=groovyNumber,groovyString,groovyLangClass,groovyJavaLangClass
 syn match   groovyUserLabel       "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=groovyLabel
 syn keyword groovyLabel           default
@@ -221,8 +221,8 @@ syn cluster groovyTop add=groovyComment,groovyLineComment
 if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp'
   syntax case ignore
   " syntax coloring for groovydoc comments (HTML)
-  " syntax include @groovyHtml <sfile>:p:h/html.vim
-   syntax include @groovyHtml runtime! syntax/html.vim
+  " syntax include @groovyHtml <sfile>:p:h/html.mnv
+   syntax include @groovyHtml runtime! syntax/html.mnv
   unlet b:current_syntax
   syntax spell default  " added by Bram
   syn region  groovyDocComment    start="/\*\*"  end="\*/" keepend contains=groovyCommentTitle,@groovyHtml,groovyDocTags,groovyTodo,@Spell
@@ -357,7 +357,7 @@ exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
 " syn match groovyTokens ";\|,\|<=>\|<>\|:\|:=\|>\|>=\|=\|==\|<\|<=\|!=\|/\|/=\|\.\.|\.\.\.\|\~=\|\~=="
 " syn match groovyTokens "\*=\|&\|&=\|\*\|->\|\~\|+\|-\|/\|?\|<<<\|>>>\|<<\|>>"
 
-" Must put explicit these ones because groovy.vim mark them as errors otherwise
+" Must put explicit these ones because groovy.mnv mark them as errors otherwise
 " syn match groovyTokens "<=>\|<>\|==\~"
 "syn cluster groovyTop add=groovyTokens
 
@@ -388,7 +388,7 @@ syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]
 syn match   groovyParenError       "\]"
 
 " ###############################
-" java.vim default highlighting
+" java.mnv default highlighting
 hi def link groovyFuncDef		Function
 hi def link groovyBraces		Function
 hi def link groovyBranch		Conditional
@@ -449,4 +449,4 @@ let b:spell_options="contained"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/group.vim b/uvim/runtime/syntax/group.mnv
index f62a4a1d69..8d647d319b 100644
--- a/uvim/runtime/syntax/group.vim
+++ b/uvim/runtime/syntax/group.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             group(5) user group file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2012-08-05
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   groupBegin          display '^' nextgroup=groupName
 
diff --git a/uvim/runtime/syntax/grub.vim b/uvim/runtime/syntax/grub.mnv
index 3743ae3643..a66bb2874f 100644
--- a/uvim/runtime/syntax/grub.vim
+++ b/uvim/runtime/syntax/grub.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             grub(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword grubTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/gsp.vim b/uvim/runtime/syntax/gsp.mnv
index 6270b2af64..f61089d5b5 100644
--- a/uvim/runtime/syntax/gsp.vim
+++ b/uvim/runtime/syntax/gsp.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	GSP - GNU Server Pages (v. 0.86)
 " Created By:	Nathaniel Harward nharward@yahoo.com
 " Last Changed: 2012 Jan 08 by Thilo Six
 " Filenames:    *.gsp
-" URL:		http://www.constructicon.com/~nharward/vim/syntax/gsp.vim
+" URL:		http://www.constructicon.com/~nharward/mnv/syntax/gsp.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -15,16 +15,16 @@ if !exists("main_syntax")
 endif
 
 " Source HTML syntax
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn case match
 
 " Include Java syntax
-syn include @gspJava syntax/java.vim
+syn include @gspJava syntax/java.mnv
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Add <java> as an HTML tag name along with its args
 syn keyword htmlTagName contained java
diff --git a/uvim/runtime/syntax/gtkrc.vim b/uvim/runtime/syntax/gtkrc.mnv
index 9c1bc2abb8..e0d6c0453a 100644
--- a/uvim/runtime/syntax/gtkrc.vim
+++ b/uvim/runtime/syntax/gtkrc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: Gtk+ theme files `gtkrc'
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2002-10-31
-" URL: http://trific.ath.cx/Ftp/vim/syntax/gtkrc.vim
+" URL: http://trific.ath.cx/Ftp/mnv/syntax/gtkrc.mnv
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/gvpr.vim b/uvim/runtime/syntax/gvpr.mnv
index a7378916f9..8442a976e2 100644
--- a/uvim/runtime/syntax/gvpr.vim
+++ b/uvim/runtime/syntax/gvpr.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Graphviz program
 " Maintainer: Matthew Fernandez <matthew.fernandez@gmail.com>
 " Last Change: Tue, 28 Jul 2020 17:20:44 -0700
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword gvArg  ARGC ARGV
 syn keyword gvBeg  BEGIN BEG_G N E END END_G
@@ -38,7 +38,7 @@ syn match   gvVar
   \ "\$\(\(F\|G\|NG\|O\|T\|tgtname\|tvedge\|tvnext\|tvroot\|tvtype\)\>\)\?\(\<\)\@!"
 syn keyword gvWord break continue else for forr if return switch while
 
-" numbers adapted from c.vim's cNumbers and friends
+" numbers adapted from c.mnv's cNumbers and friends
 syn match gvNums      transparent "\<\d\|\.\d" contains=gvNumber,gvFloat,gvOctal
 syn match gvNumber    contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
 syn match gvNumber    contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
@@ -52,7 +52,7 @@ syn match gvFloat     contained "\d\+e[-+]\=\d\+[fl]\=\>"
 syn region gvString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=gvFormat,gvSpecial extend
 syn region gvString start="'" skip="\\\\\|\\'" end="'" contains=gvFormat,gvSpecial extend
 
-" adapted from c.vim's cFormat for c_no_c99
+" adapted from c.mnv's cFormat for c_no_c99
 syn match gvFormat "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
 
 syn match gvSpecial "\\." contained
diff --git a/uvim/runtime/syntax/gyp.vim b/uvim/runtime/syntax/gyp.mnv
index 14c07b8726..2cfab61450 100644
--- a/uvim/runtime/syntax/gyp.vim
+++ b/uvim/runtime/syntax/gyp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	GYP
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.gyp,*.gypi
@@ -12,27 +12,27 @@ if !exists('g:main_syntax')
 endif
 
 " Based on JSON syntax
-runtime! syntax/json.vim
+runtime! syntax/json.mnv
 
 " Single quotes are allowed
 syn clear jsonStringSQError
 
 syn match jsonKeywordMatch /'\([^']\|\\\'\)\+'[[:blank:]\r\n]*\:/ contains=jsonKeyword
-if has('conceal') && (!exists('g:vim_json_conceal') || g:vim_json_conceal==1)
+if has('conceal') && (!exists('g:mnv_json_conceal') || g:mnv_json_conceal==1)
    syn region  jsonKeyword matchgroup=jsonQuote start=/'/  end=/'\ze[[:blank:]\r\n]*\:/ concealends contained
 else
    syn region  jsonKeyword matchgroup=jsonQuote start=/'/  end=/'\ze[[:blank:]\r\n]*\:/ contained
 endif
 
 syn match  jsonStringMatch /'\([^']\|\\\'\)\+'\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
-if has('conceal') && (!exists('g:vim_json_conceal') || g:vim_json_conceal==1)
+if has('conceal') && (!exists('g:mnv_json_conceal') || g:mnv_json_conceal==1)
     syn region  jsonString oneline matchgroup=jsonQuote start=/'/  skip=/\\\\\|\\'/  end=/'/ concealends contains=jsonEscape contained
 else
     syn region  jsonString oneline matchgroup=jsonQuote start=/'/  skip=/\\\\\|\\'/  end=/'/ contains=jsonEscape contained
 endif
 
 " Trailing commas are allowed
-if !exists('g:vim_json_warnings') || g:vim_json_warnings==1
+if !exists('g:mnv_json_warnings') || g:mnv_json_warnings==1
     syn clear jsonTrailingCommaError
 endif
 
diff --git a/uvim/runtime/syntax/haml.vim b/uvim/runtime/syntax/haml.mnv
index c14b88f502..341dd37846 100644
--- a/uvim/runtime/syntax/haml.vim
+++ b/uvim/runtime/syntax/haml.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Haml
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	*.haml
 " Last Change:	2019 Dec 05
 
@@ -13,11 +13,11 @@ if !exists("main_syntax")
 endif
 let b:ruby_no_expensive = 1
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet! b:current_syntax
-silent! syn include @hamlSassTop syntax/sass.vim
+silent! syn include @hamlSassTop syntax/sass.mnv
 unlet! b:current_syntax
-syn include @hamlRubyTop syntax/ruby.vim
+syn include @hamlRubyTop syntax/ruby.mnv
 
 syn case match
 
@@ -106,4 +106,4 @@ if main_syntax == "haml"
   unlet main_syntax
 endif
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/hamster.vim b/uvim/runtime/syntax/hamster.mnv
index 975562da0f..f865fdd9cc 100644
--- a/uvim/runtime/syntax/hamster.vim
+++ b/uvim/runtime/syntax/hamster.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Hamster Scripting Language
 " Maintainer:  David Fishburn <fishburn@ianywhere.com>
 " Last Change: Sun Oct 24 2004 7:11:50 PM
@@ -367,4 +367,4 @@ hi def link hamsterFunction	Function
 
 let b:current_syntax = "hamster"
 
-" vim:sw=4
+" mnv:sw=4
diff --git a/uvim/runtime/syntax/handlebars.vim b/uvim/runtime/syntax/handlebars.mnv
index 439a2284f6..d8aa08a16c 100644
--- a/uvim/runtime/syntax/handlebars.vim
+++ b/uvim/runtime/syntax/handlebars.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Handlebars
 " Maintainer:   Devin Weaver
 " Last Change:  2026 Feb 20
-" Origin:       https://github.com/joukevandermaas/vim-ember-hbs
+" Origin:       https://github.com/joukevandermaas/mnv-ember-hbs
 " Credits:      Jouke van der Maas
 " License:      MIT
 " The MIT License (MIT)
@@ -32,7 +32,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 syntax cluster htmlPreproc add=hbsComponent,hbsMustache,hbsUnescaped,hbsMustacheBlock,hbsComment,hbsElseBlock,hbsEscapedMustache
 
 syntax match hbsEscapedMustache "\v\\\{\{"
diff --git a/uvim/runtime/syntax/hare.vim b/uvim/runtime/syntax/hare.mnv
index d94d6a7091..f745a4f098 100644
--- a/uvim/runtime/syntax/hare.vim
+++ b/uvim/runtime/syntax/hare.mnv
@@ -1,10 +1,10 @@
-vim9script
+mnv9script
 
-# Vim syntax file.
+# MNV syntax file.
 # Language:    Hare
 # Maintainer:  Amelia Clarke <selene@perilune.dev>
 # Last Change: 2026 Feb 15
-# Upstream:    https://git.sr.ht/~sircmpwn/hare.vim
+# Upstream:    https://git.sr.ht/~sircmpwn/hare.mnv
 
 if exists('b:current_syntax')
   finish
@@ -259,4 +259,4 @@ endif
 
 b:current_syntax = 'hare'
 
-# vim: fdm=marker et sts=2 sw=2 ts=8 tw=80
+# mnv: fdm=marker et sts=2 sw=2 ts=8 tw=80
diff --git a/uvim/runtime/syntax/haredoc.vim b/uvim/runtime/syntax/haredoc.mnv
index 953962c2ef..64ce5e5ef5 100644
--- a/uvim/runtime/syntax/haredoc.vim
+++ b/uvim/runtime/syntax/haredoc.mnv
@@ -1,10 +1,10 @@
-vim9script
+mnv9script
 
-# Vim syntax file.
+# MNV syntax file.
 # Language:    Haredoc (Hare documentation format)
 # Maintainer:  Amelia Clarke <selene@perilune.dev>
 # Last Change: 2026 Jan 24
-# Upstream:    https://git.sr.ht/~sircmpwn/hare.vim
+# Upstream:    https://git.sr.ht/~sircmpwn/hare.mnv
 
 if exists('b:current_syntax')
   finish
@@ -39,4 +39,4 @@ endif
 
 b:current_syntax = 'haredoc'
 
-# vim: fdm=marker et sts=2 sw=2 ts=8 tw=80
+# mnv: fdm=marker et sts=2 sw=2 ts=8 tw=80
diff --git a/uvim/runtime/syntax/haskell.vim b/uvim/runtime/syntax/haskell.mnv
index f3c40cec8e..220f66aac2 100644
--- a/uvim/runtime/syntax/haskell.vim
+++ b/uvim/runtime/syntax/haskell.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Haskell
 " Maintainer:		Haskell Cafe mailinglist <haskell-cafe@haskell.org>
 " 			(need to be subscribed to post)
 " Last Change:		2024 Mar 28 by Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
-"			2025 Nov 20 by Vim Project: Allow spaces in backticks #18776
+"			2025 Nov 20 by MNV Project: Allow spaces in backticks #18776
 " Original Author:	John Williams <jrw@pobox.com>
 "
 " Thanks to Ryan Crumley for suggestions and John Meacham for
@@ -27,7 +27,7 @@
 "
 " 2004 Feb 19: Added C preprocessor directive handling, corrected eol comments
 "	       cleaned away literate haskell support (should be entirely in
-"	       lhaskell.vim)
+"	       lhaskell.mnv)
 " 2004 Feb 20: Cleaned up C preprocessor directive handling, fixed single \
 "	       in eol comment character class
 " 2004 Feb 23: Made the leading comments somewhat clearer where it comes
@@ -112,7 +112,7 @@ syn region  hsPragma	       start="{-#" end="#-}"
 
 syn keyword hsTodo	        contained FIXME TODO XXX NOTE
 
-" C Preprocessor directives. Shamelessly ripped from c.vim and trimmed
+" C Preprocessor directives. Shamelessly ripped from c.mnv and trimmed
 " First, see whether to flag directive-like lines or not
 if (!exists("hs_allow_hash_operator"))
     syn match	cError		display "^\s*\(%:\|#\).*$"
@@ -193,4 +193,4 @@ hi def link cCppOut			  Comment
 
 let b:current_syntax = "haskell"
 
-" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
+" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=mnv
diff --git a/uvim/runtime/syntax/haste.vim b/uvim/runtime/syntax/haste.mnv
index 79e9f5ec56..7347b5c4c1 100644
--- a/uvim/runtime/syntax/haste.vim
+++ b/uvim/runtime/syntax/haste.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	HASTE - a language for VLSI IC programming
 " Maintainer:	M. Tranchero - maurizio.tranchero?gmail.com
 " Credits:	some parts have been taken from vhdl, verilog, and C syntax
@@ -139,4 +139,4 @@ hi def link hasteInclude	Include
 
 let b:current_syntax = "haste"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/hastepreproc.vim b/uvim/runtime/syntax/hastepreproc.mnv
index f08bf3fbf3..33f6f1bd00 100644
--- a/uvim/runtime/syntax/hastepreproc.vim
+++ b/uvim/runtime/syntax/hastepreproc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Haste preprocessor files 
 " Maintainer:	M. Tranchero - maurizio.tranchero@gmail.com
 " Credits:	some parts have been taken from vhdl, verilog, and C syntax
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
   finish
 endif
 " Read the haste syntax to start with
-runtime! syntax/haste.vim
+runtime! syntax/haste.mnv
 unlet b:current_syntax
 
 " case is significant
@@ -35,4 +35,4 @@ hi def link hastepreprocError	Error
 
 let b:current_syntax = "hastepreproc"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/hb.vim b/uvim/runtime/syntax/hb.mnv
index 7bff1df9fb..773cb2ff6d 100644
--- a/uvim/runtime/syntax/hb.vim
+++ b/uvim/runtime/syntax/hb.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Hyper Builder
 " Maintainer:	Alejandro Forero Cuervo
-" URL:		http://bachue.com/hb/vim/syntax/hb.vim
+" URL:		http://bachue.com/hb/mnv/syntax/hb.mnv
 " Last Change:	2012 Jan 08 by Thilo Six
 
 " quit when a syntax file was already loaded
@@ -10,10 +10,10 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Read the HTML syntax to start with
-"syn include @HTMLStuff <sfile>:p:h/htmlhb.vim
+"syn include @HTMLStuff <sfile>:p:h/htmlhb.mnv
 
 "this would be nice but we are supposed not to do it
 "set mps=<:>
@@ -86,4 +86,4 @@ let b:current_syntax = "hb"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/hcl.vim b/uvim/runtime/syntax/hcl.mnv
index fc1fc5ae37..333aa286ff 100644
--- a/uvim/runtime/syntax/hcl.vim
+++ b/uvim/runtime/syntax/hcl.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    HCL
 " Maintainer:  Gregory Anders
-" Upstream:    https://github.com/hashivim/vim-terraform
+" Upstream:    https://github.com/hashimnv/mnv-terraform
 " Last Change: 2024-09-03
 " License:     ISC
 "
diff --git a/uvim/runtime/syntax/help.vim b/uvim/runtime/syntax/help.mnv
index effdc4b874..ea3c810b39 100644
--- a/uvim/runtime/syntax/help.vim
+++ b/uvim/runtime/syntax/help.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
-" Language:		Vim help file
+" MNV syntax file
+" Language:		MNV help file
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Last Change:		2025 Nov 13
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,12 +10,12 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,_,192-255
 
 if !exists('g:help_example_languages')
-  let g:help_example_languages = #{ vim: 'vim', vim9: 'vim' }
+  let g:help_example_languages = #{ mnv: 'mnv', mnv9: 'mnv' }
 endif
 
 syn match helpHeadline		"^[A-Z.][-A-Z0-9 .,()_']*?\=\ze\(\s\+\*\|$\)"
@@ -33,16 +33,16 @@ endif
 for [s:lang, s:syntax] in g:help_example_languages->items()
   unlet! b:current_syntax
 
-  if s:lang == "vim9"
-    let b:vimsyn_force_vim9 = v:true
+  if s:lang == "mnv9"
+    let b:mnvsyn_force_mnv9 = v:true
   endif
 
   " silent! to prevent E403
   execute 'silent! syn include' $'@helpExampleHighlight_{s:lang}'
-        \ $'syntax/{s:syntax}.vim'
+        \ $'syntax/{s:syntax}.mnv'
 
-  if s:lang == "vim9"
-    unlet b:vimsyn_force_vim9
+  if s:lang == "mnv9"
+    unlet b:mnvsyn_force_mnv9
   endif
 
   execute $'syn region helpExampleHighlight_{s:lang} matchgroup=helpIgnore'
@@ -53,13 +53,13 @@ for [s:lang, s:syntax] in g:help_example_languages->items()
 endfor
 unlet! s:lang s:syntax
 
-if has_key(g:help_example_languages, "vim9")
-  " for example at :help vim9-mix
-  syn region vim9LegacyHeader_HelpExample
-	\ start=+" legacy Vim script comments may go here+
-	\ end="^\ze\s*vim9s\%[cript]\>"
-	\ contains=@vimLegacyTop,vimComment,vimLineComment
-  syn cluster helpExampleHighlight_vim9 add=vim9LegacyHeader_HelpExample
+if has_key(g:help_example_languages, "mnv9")
+  " for example at :help mnv9-mix
+  syn region mnv9LegacyHeader_HelpExample
+	\ start=+" legacy MNV script comments may go here+
+	\ end="^\ze\s*mnv9s\%[cript]\>"
+	\ contains=@mnvLegacyTop,mnvComment,mnvLineComment
+  syn cluster helpExampleHighlight_mnv9 add=mnv9LegacyHeader_HelpExample
 endif
 
 if has("ebcdic")
@@ -82,11 +82,11 @@ else
 endif
 syn match helpNormal		"|.*====*|"
 syn match helpNormal		"|||"
-syn match helpNormal		":|vim:|"	" for :help modeline
-syn match helpVim		"\<Vim version [0-9][0-9.a-z]*"
-syn match helpVim		"^\s\+\zsVIM - main help file$"
-syn region helpVim		start="^\s\+VIM REFERENCE" end="^$"
-syn region helpVim		start="^\s\+VIM USER MANUAL" end="^$"
+syn match helpNormal		":|mnv:|"	" for :help modeline
+syn match helpMNV		"\<MNV version [0-9][0-9.a-z]*"
+syn match helpMNV		"^\s\+\zsMNV - main help file$"
+syn region helpMNV		start="^\s\+MNV REFERENCE" end="^$"
+syn region helpMNV		start="^\s\+MNV USER MANUAL" end="^$"
 syn match helpOption		"'[a-z]\{2,\}'"
 syn match helpOption		"'t_..'"
 syn match helpNormal		"'ab'"
@@ -141,7 +141,7 @@ syn match helpSpecial		"\[line]"
 syn match helpSpecial		"\[count]"
 syn match helpSpecial		"\[offset]"
 syn match helpSpecial		"\[cmd]"
-syn match helpNormal		"vim9\[cmd]"
+syn match helpNormal		"mnv9\[cmd]"
 syn match helpSpecial		"\[num]"
 syn match helpSpecial		"\[+num]"
 syn match helpSpecial		"\[-num]"
@@ -219,9 +219,9 @@ syn match helpDiffRemoved	"\t[* ]Removed\t\+[a-z].*"
 syn region helpReturnType
       \ start="^\t\tReturn type: "
       \ end="^$"
-      \ contains=@vimType,helpHyperTextJump,helpSpecial
+      \ contains=@mnvType,helpHyperTextJump,helpSpecial
       \ transparent
-syn match helpSpecial		contained "{type}" containedin=vimCompoundType
+syn match helpSpecial		contained "{type}" containedin=mnvCompoundType
 
 " digraph.txt
 syn region helpDigraphTable
@@ -235,10 +235,10 @@ syn region helpExCommand_Version
       \ end="\n\ze\n:ve\[rsion] {nr}"
       \ contains=helpHyperTextEntry,helpHyperTextJump,helpOption
 
-" Additionally load a language-specific syntax file "help_ab.vim".
+" Additionally load a language-specific syntax file "help_ab.mnv".
 let s:i = match(expand("%"), '\.\a\ax$')
 if s:i > 0
-  exe "runtime syntax/help_" . strpart(expand("%"), s:i + 1, 2) . ".vim"
+  exe "runtime syntax/help_" . strpart(expand("%"), s:i + 1, 2) . ".mnv"
 endif
 unlet s:i
 
@@ -255,7 +255,7 @@ hi def link helpHyperTextEntry	String
 hi def link helpHeadline	Statement
 hi def link helpHeader		PreProc
 hi def link helpSectionDelim	PreProc
-hi def link helpVim		Identifier
+hi def link helpMNV		Identifier
 hi def link helpCommand		Comment
 hi def link helpExample		Comment
 hi def link helpOption		Type
@@ -308,12 +308,12 @@ hi def link helpDiffRemoved	Removed
 
 if has('textprop') && expand('%:p') =~ '[/\\]doc[/\\]syntax.txt'
   " highlight groups with their respective color
-  import 'dist/vimhelp.vim'
-  call vimhelp.HighlightGroups()
+  import 'dist/mnvhelp.mnv'
+  call mnvhelp.HighlightGroups()
 endif
 
 let b:current_syntax = "help"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/help_it.vim b/uvim/runtime/syntax/help_it.mnv
index e76851d446..58f4c5989a 100644
--- a/uvim/runtime/syntax/help_it.vim
+++ b/uvim/runtime/syntax/help_it.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
-" Language:	Italian Vim program help files *.itx
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax file
+" Language:	Italian MNV program help files *.itx
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2024 Oct 16
 "
-" This script is sourced from syntax/help.vim.
+" This script is sourced from syntax/help.mnv.
 
 syn keyword helpNote		nota Nota NOTA nota: Nota: NOTA: notare Notare NOTARE notare: Notare: NOTARE:
 syn match helpNote		"\c(nota\(:\|\>\)"ms=s+1
@@ -14,4 +14,4 @@ syn match helpSpecial		"Nmo"me=e-2
 syn match helpSpecial		"\[interv.]"
 syn region helpNotVi		start="{non" start="{solo" start="{disponibile" end="}" contains=helpLeadBlank,helpHyperTextJump
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/help_ru.vim b/uvim/runtime/syntax/help_ru.mnv
index d393405f98..0bbda2b1d7 100644
--- a/uvim/runtime/syntax/help_ru.vim
+++ b/uvim/runtime/syntax/help_ru.mnv
@@ -1,5 +1,5 @@
-" Vim syntax file
-" Language:     Russian Vim program help files *.rux
+" MNV syntax file
+" Language:     Russian MNV program help files *.rux
 " Maintainer:   Restorer, <restorer@mail2k.ru>
 " Last Change:  2025 Jul 07
 " 
@@ -19,11 +19,11 @@ syntax match helpHyperTextEntry	"\*[^"*|]\+\*$" contains=helpStar
 syntax match helpHeadline	"^[А-ЯЁ]\{2,}[ .]\=[-,А-ЯЁA-Z0-9 .()]*"
 
 " Определение синтаксиса заголовка основного файла справки
-syntax match helpVim		"\<РЕДАКТОР VIM — общий обзор\>"
+syntax match helpMNV		"\<РЕДАКТОР MNV — общий обзор\>"
 " Определение синтаксиса наименования справочника
-syntax match helpVim		"\<СПРАВОЧНИК ПО РЕДАКТОРУ VIM\>"
+syntax match helpMNV		"\<СПРАВОЧНИК ПО РЕДАКТОРУ MNV\>"
 " Определение синтаксиса наименования руководства пользователя
-syntax match helpVim		"\<РУКОВОДСТВО ПОЛЬЗОВАТЕЛЯ ПО РЕДАКТОРУ VIM\>"
+syntax match helpMNV		"\<РУКОВОДСТВО ПОЛЬЗОВАТЕЛЯ ПО РЕДАКТОРУ MNV\>"
 " Определение синтаксиса автора справочника, руководства пользователя
 syntax match helpAutor		"^\s\+\<автор\%[ы:] .*$"
 " Определение синтаксиса примечаний в тексте, начала примеров и т. п.
@@ -33,7 +33,7 @@ syntax keyword helpDeprecated	Недействующий Недействующ�
 syntax keyword helpDeprecated	недейстующиий недействующая недействующее
 syntax keyword helpDeprecated	Устаревший Устаревшая Устаревшее
 syntax keyword helpDeprecated	устаревший устаревшая устаревшее
-" Определение синтаксиса Ex-команд в документации Vim (старый стиль)
+" Определение синтаксиса Ex-команд в документации MNV (старый стиль)
 syntax match helpCommand	~\":\w\+\%[!]\"~hs=s+1,he=e-1
 " Определение синтаксиса специальных обозначений
 syntax match helpSpecial	"{[-а-яёА-ЯЁ0-9'":%#=[\]<>.,]\+}"
@@ -51,17 +51,17 @@ syntax match helpSpecial	"\[смещение]"
 syntax match helpSpecial	"\[параметр]"
 syntax match helpSpecial	"\[параметры]"
 syntax match helpSpecial	"CTRL-{символ}"
-syntax region helpNotVi		start="{Доступно только" start="{В редкторе Vim" start="{В редакторе Vi" end="}" contains=helpLeadBlank,helpHyperTextJump
+syntax region helpNotVi		start="{Доступно только" start="{В редкторе MNV" start="{В редакторе Vi" end="}" contains=helpLeadBlank,helpHyperTextJump
 " Определение синтаксиса примечаний переводчика
 syntax region helpTrnsNote	start="\[Примеч\. перев\. — " end="\]\." contains=helpComment
-" Группа подсветки синтаксиса Ex-команд внутри строки документации Vim
-hi def link helpCommand		VimCommand
-" Группа подсветки синтаксиса примеров в документации Vim
+" Группа подсветки синтаксиса Ex-команд внутри строки документации MNV
+hi def link helpCommand		MNVCommand
+" Группа подсветки синтаксиса примеров в документации MNV
 hi def link helpExample		SpecialComment
 "hi def link helpExample		PreCondit
 " Группа подсветки синтаксиса примечаний переводчика
 hi def link helpTrnsNote	Comment
 " Группа подсветки синтаксиса автора справочника, руководства пользователя
-hi def link helpAutor		HelpVim
+hi def link helpAutor		HelpMNV
 "
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/hercules.vim b/uvim/runtime/syntax/hercules.mnv
index d305707662..d1b5c79f4d 100644
--- a/uvim/runtime/syntax/hercules.vim
+++ b/uvim/runtime/syntax/hercules.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Hercules
 " Maintainer:	Dana Edwards <Dana_Edwards@avanticorp.com>
 " Extensions:   *.vc,*.ev,*.rs
@@ -116,4 +116,4 @@ hi def link herculesError      Error
 
 let b:current_syntax = "hercules"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/hex.vim b/uvim/runtime/syntax/hex.mnv
index 35edf08e9f..f943cc8ea2 100644
--- a/uvim/runtime/syntax/hex.vim
+++ b/uvim/runtime/syntax/hex.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Intel HEX
 " Maintainer:	Markus Heidelberg <markus.heidelberg@web.de>
 " Previous version:	Sams Ricahrd <sams@ping.at>
@@ -86,4 +86,4 @@ hi def link hexChecksum            DiffChange
 
 let b:current_syntax = "hex"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/hgcommit.vim b/uvim/runtime/syntax/hgcommit.mnv
index e9f31bef61..64f06e0a3a 100644
--- a/uvim/runtime/syntax/hgcommit.vim
+++ b/uvim/runtime/syntax/hgcommit.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	hg/sl (Mercurial / Sapling) commit file
 " Maintainer:	Ken Takata <kentkt at csc dot jp>
 "  		Max Coplan <mchcopl@gmail.com>
 " Last Change:	2022-12-08
-" License:	VIM License
-" URL:		https://github.com/k-takata/hg-vim
+" License:	MNV License
+" URL:		https://github.com/k-takata/hg-mnv
 
 if exists("b:current_syntax")
   finish
@@ -18,7 +18,7 @@ syn match hgcommitChanged "^\%(SL\|HG\): \zschanged .*$" contains=@NoSpell conta
 syn match hgcommitRemoved "^\%(SL\|HG\): \zsremoved .*$" contains=@NoSpell contained containedin=hgcommitComment
 
 syn region hgcommitDiff start=/\%(^\(SL\|HG\): diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@hgcommitDiff
-syn include @hgcommitDiff syntax/shared/hgcommitDiff.vim
+syn include @hgcommitDiff syntax/shared/hgcommitDiff.mnv
 
 hi def link hgcommitComment Comment
 hi def link hgcommitUser    String
diff --git a/uvim/runtime/syntax/hitest.vim b/uvim/runtime/syntax/hitest.mnv
index 27b8eab73a..70d9c9aa96 100644
--- a/uvim/runtime/syntax/hitest.vim
+++ b/uvim/runtime/syntax/hitest.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	none; used to see highlighting
 " Maintainer:	github user lacygoill
 " Last Change:	2023 Mar 08
 
 " To see your current highlight settings, do
-"    :so $VIMRUNTIME/syntax/hitest.vim
+"    :so $MNVRUNTIME/syntax/hitest.mnv
 
-import 'dist/vimhighlight.vim'
-call vimhighlight.HighlightTest()
+import 'dist/mnvhighlight.mnv'
+call mnvhighlight.HighlightTest()
diff --git a/uvim/runtime/syntax/hlsplaylist.vim b/uvim/runtime/syntax/hlsplaylist.mnv
index 245eee213b..21f813d9a2 100644
--- a/uvim/runtime/syntax/hlsplaylist.vim
+++ b/uvim/runtime/syntax/hlsplaylist.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: HLS Playlist
 " Maintainer: Benoît Ryder <benoit@ryder.fr>
 " Latest Revision: 2022-09-23
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Comment line
 syn match  hlsplaylistComment  "^#\(EXT\)\@!.*$"
@@ -117,4 +117,4 @@ let b:current_syntax = "hlsplaylist"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: sts=2 sw=2 et
+" mnv: sts=2 sw=2 et
diff --git a/uvim/runtime/syntax/hog.vim b/uvim/runtime/syntax/hog.mnv
index 24aa2035ba..1c37fa53a4 100644
--- a/uvim/runtime/syntax/hog.vim
+++ b/uvim/runtime/syntax/hog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: hog (Snort.conf + .rules)
 " Maintainer: Victor Roemer, <vroemer@badsec.org>.
 " Last Change: 2019 Sep 22
diff --git a/uvim/runtime/syntax/hollywood.vim b/uvim/runtime/syntax/hollywood.mnv
index 16df9fa736..8fe1f0d031 100644
--- a/uvim/runtime/syntax/hollywood.vim
+++ b/uvim/runtime/syntax/hollywood.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Hollywood 10.0
-" Maintainer:   Ola S�der <rolfkopman@gmail.com>
+" Maintainer:   Ola S�der <rolfkopman@gmail.com>
 " First Author: Tom Crecelius <holly@net-eclipse.net>
 " Last Change:  2024 Jun 20
 " Highlighting Issues:
@@ -27,7 +27,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if !exists("hw_version")
   let hw_version = 10
@@ -183,4 +183,4 @@ let b:current_syntax = "hollywood"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: et ts=8 sw=2
+" mnv: et ts=8 sw=2
diff --git a/uvim/runtime/syntax/hostconf.vim b/uvim/runtime/syntax/hostconf.mnv
index 593ed72eed..2c458cab32 100644
--- a/uvim/runtime/syntax/hostconf.vim
+++ b/uvim/runtime/syntax/hostconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             host.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-25
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword hostconfTodo
       \ contained
diff --git a/uvim/runtime/syntax/hostsaccess.vim b/uvim/runtime/syntax/hostsaccess.mnv
index 7201816f48..8a9aebc26d 100644
--- a/uvim/runtime/syntax/hostsaccess.vim
+++ b/uvim/runtime/syntax/hostsaccess.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	hosts.deny, hosts.allow configuration files
 " Maintainer:	Thilo Six <T.Six@gmx.de>
 " Last Change:	2011 May 01
-" Derived From: conf.vim
+" Derived From: conf.mnv
 " Credits:	Bram Moolenaar
 "
 " This file is there to get at least a minimal highlighting.
@@ -14,10 +14,10 @@ if exists("b:current_syntax")
   finish
 endif
 
-" For a starter we just use conf.vim for highlighting
-runtime! syntax/conf.vim
+" For a starter we just use conf.mnv for highlighting
+runtime! syntax/conf.mnv
 unlet b:current_syntax
 
 
 let b:current_syntax = "hostsaccess"
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/html.vim b/uvim/runtime/syntax/html.mnv
index 0e615b70fe..cf184ba6c4 100644
--- a/uvim/runtime/syntax/html.vim
+++ b/uvim/runtime/syntax/html.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		HTML
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainers: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 "			Claudio Fleiner <claudio@fleiner.com>
 " Last Change:		2023 Nov 28
-" 2024 Jul 30 by Vim Project: increase syn-sync-minlines to 250
-" 2025 May 10 by Vim Project: update comment
+" 2024 Jul 30 by MNV Project: increase syn-sync-minlines to 250
+" 2025 May 10 by MNV Project: update comment
 
-" See :help html.vim for some comments and a description of the options
+" See :help html.mnv for some comments and a description of the options
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -18,11 +18,11 @@ if !exists("main_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax spell toplevel
 
-syn include @htmlXml syntax/xml.vim
+syn include @htmlXml syntax/xml.mnv
 unlet b:current_syntax
 
 syn case ignore
@@ -272,7 +272,7 @@ syn keyword htmlTagName		contained noscript
 syn keyword htmlSpecialTagName	contained script style
 if main_syntax != 'java' || exists("java_javascript")
   " JAVA SCRIPT
-  syn include @htmlJavaScript syntax/javascript.vim
+  syn include @htmlJavaScript syntax/javascript.mnv
   unlet b:current_syntax
   syn region  javaScript start=+<script\>\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
   syn region  htmlScriptTag	contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
@@ -297,7 +297,7 @@ endif
 
 if main_syntax != 'java' || exists("java_vb")
   " VB SCRIPT
-  syn include @htmlVbScript syntax/vb.vim
+  syn include @htmlVbScript syntax/vb.mnv
   unlet b:current_syntax
   syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
 endif
@@ -307,7 +307,7 @@ syn cluster htmlJavaScript	add=@htmlPreproc
 if main_syntax != 'java' || exists("java_css")
   " embedded style sheets
   syn keyword htmlArg		contained media
-  syn include @htmlCss syntax/css.vim
+  syn include @htmlCss syntax/css.mnv
   unlet b:current_syntax
   syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
   syn match htmlCssStyleComment contained "\%(<!--\|-->\)"
@@ -327,7 +327,7 @@ endif
 
 " Folding
 " (Originally written by Ingo Karkat and Marcus Zanona; see
-" https://vi.stackexchange.com/questions/2306/html-syntax-folding-in-vim .)
+" https://vi.stackexchange.com/questions/2306/html-syntax-folding-in-mnv .)
 if get(g:, "html_syntax_folding", 0)
   syn region htmlFold start="<\z(\<\%(area\|base\|br\|col\|command\|embed\|hr\|img\|input\|keygen\|link\|meta\|param\|source\|track\|wbr\>\)\@![a-z-]\+\>\)\%(\_s*\_[^/]\?>\|\_s\_[^>]*\_[^>/]>\)" end="</\z1\_s*>" fold transparent keepend extend containedin=htmlHead,htmlH\d
   " fold comments (the real ones and the old Netscape ones)
@@ -411,4 +411,4 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/htmlangular.vim b/uvim/runtime/syntax/htmlangular.mnv
index 021e61f9b1..f84b4c33be 100644
--- a/uvim/runtime/syntax/htmlangular.vim
+++ b/uvim/runtime/syntax/htmlangular.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Angular HTML template
 " Maintainer: Dennis van den Berg <dennis@vdberg.dev>
 " Last Change: 2024 Aug 22
@@ -12,7 +12,7 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 let b:current_syntax = "htmlangular"
diff --git a/uvim/runtime/syntax/htmlcheetah.vim b/uvim/runtime/syntax/htmlcheetah.mnv
index 0721c76b44..d631d45306 100644
--- a/uvim/runtime/syntax/htmlcheetah.vim
+++ b/uvim/runtime/syntax/htmlcheetah.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	HTML with Cheetah tags
 " Maintainer:	Max Ischenko <mfi@ukr.net>
 " Last Change: 2003-05-11
@@ -12,8 +12,8 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
-runtime! syntax/cheetah.vim
-runtime! syntax/html.vim
+runtime! syntax/cheetah.mnv
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syntax cluster htmlPreproc add=cheetahPlaceHolder
diff --git a/uvim/runtime/syntax/htmldjango.vim b/uvim/runtime/syntax/htmldjango.mnv
index 07b1c375e8..598ada512b 100644
--- a/uvim/runtime/syntax/htmldjango.vim
+++ b/uvim/runtime/syntax/htmldjango.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Django HTML template
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
 " Last Change:	2014 Jul 13
@@ -12,8 +12,8 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
-runtime! syntax/django.vim
-runtime! syntax/html.vim
+runtime! syntax/django.mnv
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock
diff --git a/uvim/runtime/syntax/htmlm4.vim b/uvim/runtime/syntax/htmlm4.mnv
index ee1f06e5f4..a079bdd224 100644
--- a/uvim/runtime/syntax/htmlm4.vim
+++ b/uvim/runtime/syntax/htmlm4.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	HTML and M4
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/htmlm4.vim
+" URL:		http://www.fleiner.com/mnv/syntax/htmlm4.mnv
 " Last Change:	2001 Apr 30
 
 " quit when a syntax file was already loaded
@@ -14,11 +14,11 @@ if !exists("main_syntax")
   let main_syntax='htmlm4'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 syn case match
 
-runtime! syntax/m4.vim
+runtime! syntax/m4.mnv
 
 unlet b:current_syntax
 syn cluster htmlPreproc add=@m4Top
diff --git a/uvim/runtime/syntax/htmlos.vim b/uvim/runtime/syntax/htmlos.mnv
index b54ca7a921..748eeef83a 100644
--- a/uvim/runtime/syntax/htmlos.vim
+++ b/uvim/runtime/syntax/htmlos.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	HTML/OS by Aestiva
 " Maintainer:	Jason Rust <jrust@westmont.edu>
-" URL:		http://www.rustyparts.com/vim/syntax/htmlos.vim
+" URL:		http://www.rustyparts.com/mnv/syntax/htmlos.mnv
 " Info:		http://www.rustyparts.com/scripts.php
 " Last Change:	2003 May 11
 "
@@ -15,7 +15,7 @@ if !exists("main_syntax")
   let main_syntax = 'htmlos'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster htmlPreproc add=htmlosRegion
@@ -146,4 +146,4 @@ if main_syntax == 'htmlos'
   unlet main_syntax
 endif
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/hyprlang.vim b/uvim/runtime/syntax/hyprlang.mnv
index 2e51c9a3b6..52d5106182 100644
--- a/uvim/runtime/syntax/hyprlang.vim
+++ b/uvim/runtime/syntax/hyprlang.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Previous Maintainer: Luca Saccarola <github.e41mv@aleeas.com>
 " Maintainer:   This runtime file is looking for a new maintainer.
 " Language:     hyprlang
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:cpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = "hyprlang"
 
@@ -62,4 +62,4 @@ hi def link hyprCommand   Keyword
 
 let &cpo = s:cpo
 unlet s:cpo
-" vim: ts=8 sts=2 sw=2 et
+" mnv: ts=8 sts=2 sw=2 et
diff --git a/uvim/runtime/syntax/i3config.vim b/uvim/runtime/syntax/i3config.mnv
index fdd6438be2..06f22acb91 100644
--- a/uvim/runtime/syntax/i3config.vim
+++ b/uvim/runtime/syntax/i3config.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language: i3 config file
-" Original Author: Josef Litos (litoj/i3config.vim)
+" Original Author: Josef Litos (litoj/i3config.mnv)
 " Maintainer: Josef Litos (litoj)
 " Previous maintainer: Quentin Hibon (github user hiqua)
 " Version: 1.2.7
@@ -8,7 +8,7 @@
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
-" http://vimdoc.sourceforge.net/htmldoc/syntax.html
+" http://mnvdoc.sourceforge.net/htmldoc/syntax.html
 "
 "
 " Quit when a syntax file was already loaded
@@ -260,7 +260,7 @@ syn keyword i3ConfigResizeType grow shrink contained skipwhite nextgroup=i3Confi
 syn keyword i3ConfigResizeType set contained skipwhite nextgroup=i3ConfigResizeDir,i3ConfigUnit
 syn keyword i3ConfigActionKeyword resize contained skipwhite nextgroup=i3ConfigResizeType
 
-" 6.14 VIM-like marks
+" 6.14 MNV-like marks
 syn match i3ConfigMarkOpt /--\(add\|replace\)\( --toggle\)\?/ contained contains=i3ConfigShParam skipwhite nextgroup=i3ConfigOutputIdent
 syn keyword i3ConfigActionKeyword mark contained skipwhite nextgroup=i3ConfigMarkOpt,i3ConfigOutputIdent
 
diff --git a/uvim/runtime/syntax/ia64.vim b/uvim/runtime/syntax/ia64.mnv
index 2ff460688c..3b1cf1fbad 100644
--- a/uvim/runtime/syntax/ia64.vim
+++ b/uvim/runtime/syntax/ia64.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		IA-64 (Itanium) assembly language
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Parth Malwankar <pmalwankar@yahoo.com>
@@ -18,7 +18,7 @@ syn sync minlines=5
 
 " Read the MASM syntax to start with
 " This is needed as both IA-64 as well as IA-32 instructions are supported
-source <sfile>:p:h/masm.vim
+source <sfile>:p:h/masm.mnv
 
 "  Identifier Keyword characters (defines \k)
 syn iskeyword @,48-57,#,$,.,:,?,@-@,_,~
@@ -48,7 +48,7 @@ syn keyword ia64opcode pshradd2 psub4 rfi rsm rum shl shladd shladdp4
 syn keyword ia64opcode shrp ssm sub sum sync.i tak thash
 syn keyword ia64opcode tpa ttag xor
 
-"put to override these being recognized as floats. They are orignally from masm.vim
+"put to override these being recognized as floats. They are orignally from masm.mnv
 "put here to avoid confusion with float
 syn match   ia64Directive       "\.186"
 syn match   ia64Directive       "\.286"
@@ -290,4 +290,4 @@ hi def link ia64Todo		Todo
 
 let b:current_syntax = "ia64"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/ibasic.vim b/uvim/runtime/syntax/ibasic.mnv
index 75e59419b6..9d7ef5f12c 100644
--- a/uvim/runtime/syntax/ibasic.vim
+++ b/uvim/runtime/syntax/ibasic.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	ibasic
 " Maintainer:	Mark Manning <markem@airmail.net>
 " Originator:	Allan Kelly <Allan.Kelly@ed.ac.uk>
 " Created:	10/1/2006
 " Updated:	10/21/2006
-" Description:  A vim file to handle the IBasic file format.
+" Description:  A mnv file to handle the IBasic file format.
 " Notes:
 "	Updated by Mark Manning <markem@airmail.net>
 "	Applied IBasic support to the already excellent support for standard
@@ -18,7 +18,7 @@
 "	This version is based upon the commands found in IBasic (www.pyxia.com).
 "	MEM 10/6/2006
 "
-"	Quit when a (custom) syntax file was already loaded (Taken from c.vim)
+"	Quit when a (custom) syntax file was already loaded (Taken from c.mnv)
 "
 if exists("b:current_syntax")
   finish
@@ -173,4 +173,4 @@ hi def link ibasicMathOperator		Operator
 
 let b:current_syntax = "ibasic"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/icemenu.vim b/uvim/runtime/syntax/icemenu.mnv
index 6513287dfc..77bb2ee0c7 100644
--- a/uvim/runtime/syntax/icemenu.vim
+++ b/uvim/runtime/syntax/icemenu.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Icewm Menu
 " Maintainer:	James Mahler <James.Mahler@gmail.com>
 " Last Change:	Fri Apr  1 15:13:48 EST 2005
diff --git a/uvim/runtime/syntax/icon.vim b/uvim/runtime/syntax/icon.mnv
index 276bb58497..088fa04681 100644
--- a/uvim/runtime/syntax/icon.vim
+++ b/uvim/runtime/syntax/icon.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Icon
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Wendell Turner <wendell@adsi-m4.com> (invalid last known address)
@@ -208,4 +208,4 @@ hi def link iconDocumentation	Comment
 " Postscript  {{{1
 let b:current_syntax = "icon"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/idl.vim b/uvim/runtime/syntax/idl.mnv
index 2f20dec2d7..1573787b67 100644
--- a/uvim/runtime/syntax/idl.vim
+++ b/uvim/runtime/syntax/idl.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    IDL (Interface Description Language)
 " Created By:  Jody Goldberg
-" Maintainer:  Michael Geddes <vim@frog.wheelycreek.net>
+" Maintainer:  Michael Geddes <mnv@frog.wheelycreek.net>
 " Last Change:  2012 Jan 11
 
 
@@ -16,7 +16,7 @@
 "
 " History:
 " 2.0: Michael's new version
-" 2.1: Support for Vim 7 spell (Anduin Withers)
+" 2.1: Support for MNV 7 spell (Anduin Withers)
 "
 
 if exists("b:current_syntax")
@@ -25,7 +25,7 @@ endif
 
 let s:cpo_save = &cpo
 try
-  set cpo&vim
+  set cpo&mnv
 
   if exists("idlsyntax_showerror")
     syn match idlError +\S+ skipwhite skipempty nextgroup=idlError
@@ -321,4 +321,4 @@ finally
   let &cpo = s:cpo_save
   unlet s:cpo_save
 endtry
-" vim: sw=2 et
+" mnv: sw=2 et
diff --git a/uvim/runtime/syntax/idlang.vim b/uvim/runtime/syntax/idlang.mnv
index f7bfcb203a..cb0842fd01 100644
--- a/uvim/runtime/syntax/idlang.vim
+++ b/uvim/runtime/syntax/idlang.mnv
@@ -2,7 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Created By: Hermann Rochholz <Hermann.Rochholz AT gmx.de>
 " Last Change: 2011 Apr 11
-"  2024 Sep 10 by Vim Project: update syntax script, #15419
+"  2024 Sep 10 by MNV Project: update syntax script, #15419
 
 " Remove any old syntax stuff hanging around
 " quit when a syntax file was already loaded
@@ -238,4 +238,4 @@ hi def link idlangKeyword	Special
 
 
 let b:current_syntax = "idlang"
-" vim: ts=18
+" mnv: ts=18
diff --git a/uvim/runtime/syntax/idris2.vim b/uvim/runtime/syntax/idris2.mnv
index e3e3d0dcee..86c4d8f201 100644
--- a/uvim/runtime/syntax/idris2.vim
+++ b/uvim/runtime/syntax/idris2.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Idris 2
-" Maintainer:		Idris Hackers (https://github.com/edwinb/idris2-vim), Serhii Khoma <srghma@gmail.com>
+" Maintainer:		Idris Hackers (https://github.com/edwinb/idris2-mnv), Serhii Khoma <srghma@gmail.com>
 " Last Change:		2024 Nov 05
 " Original Author:	raichoo (raichoo@googlemail.com)
-" License:		Vim (see :h license)
-" Repository:		https://github.com/ShinKage/idris2-nvim
+" License:		MNV (see :h license)
+" Repository:		https://github.com/ShinKage/idris2-nmnv
 "
 
 if exists("b:current_syntax")
@@ -83,4 +83,4 @@ highlight def link idris2Backtick Operator
 
 let b:current_syntax = "idris2"
 
-" vim: nowrap sw=2 sts=2 ts=8 noexpandtab ft=vim
+" mnv: nowrap sw=2 sts=2 ts=8 noexpandtab ft=mnv
diff --git a/uvim/runtime/syntax/indent.vim b/uvim/runtime/syntax/indent.mnv
index 921a0a8ad0..2f172458ea 100644
--- a/uvim/runtime/syntax/indent.vim
+++ b/uvim/runtime/syntax/indent.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		indent(1) configuration file
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
 " Last Change:		2024 Sep 29
 "   indent_is_bsd:      If exists, will change somewhat to match BSD implementation
 "
-" TODO:     is the deny-all (a la lilo.vim nice or no?)...
+" TODO:     is the deny-all (a la lilo.mnv nice or no?)...
 "       irritating to be wrong to the last char...
 "       would be sweet if right until one char fails
 
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-,+
 
diff --git a/uvim/runtime/syntax/inform.vim b/uvim/runtime/syntax/inform.mnv
index e3e1b3e1f0..aaa502ba7e 100644
--- a/uvim/runtime/syntax/inform.vim
+++ b/uvim/runtime/syntax/inform.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Inform
 " Maintainer:   Stephen Thomas (stephen@gowarthomas.com)
-" URL:		http://www.gowarthomas.com/informvim
+" URL:		http://www.gowarthomas.com/informmnv
 " Last Change:  2006 April 20
 
 " quit when a syntax file was already loaded
@@ -290,7 +290,7 @@ else
   syn keyword informAsmObsolete contained print_paddr print_addr print_char
 endif
 
-" Handling for different versions of VIM.
+" Handling for different versions of MNV.
 
 setlocal iskeyword+=$
 command -nargs=+ SynDisplay syntax <args> display
@@ -389,4 +389,4 @@ hi def link informBadStrUnicode	informError
 
 let b:current_syntax = "inform"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/initex.vim b/uvim/runtime/syntax/initex.mnv
index 564a6e0cca..ddf8b81f66 100644
--- a/uvim/runtime/syntax/initex.vim
+++ b/uvim/runtime/syntax/initex.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             TeX (core definition)
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " This follows the grouping (sort of) found at
 " http: //www.tug.org/utilities/plain/cseq.html#top-fam
diff --git a/uvim/runtime/syntax/initng.vim b/uvim/runtime/syntax/initng.mnv
index 959c79a176..b24dac1e6d 100644
--- a/uvim/runtime/syntax/initng.vim
+++ b/uvim/runtime/syntax/initng.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	initng .i files
 " Maintainer:	Elan Ruusamäe <glen@pld-linux.org>
 " URL:		http://glen.alkohol.ee/pld/initng/
@@ -6,8 +6,8 @@
 " Version:	0.13
 " Last Change:	$Date: 2007/05/05 17:17:40 $
 "
-" Syntax highlighting for initng .i files. Inherits from sh.vim and adds
-" in the hiliting to start/stop {} blocks. Requires vim 6.3 or later.
+" Syntax highlighting for initng .i files. Inherits from sh.mnv and adds
+" in the hiliting to start/stop {} blocks. Requires mnv 6.3 or later.
 
 if &compatible || v:version < 603
 	finish
@@ -20,7 +20,7 @@ endif
 syn case match
 
 let is_bash = 1
-syn include @shTop syntax/sh.vim
+syn include @shTop syntax/sh.mnv
 
 syn region	initngService			matchgroup=initngServiceHeader start="^\s*\(service\|virtual\|daemon\|class\|cron\)\s\+\(\(\w\|[-/*]\)\+\(\s\+:\s\+\(\w\|[-/*]\)\+\)\?\)\s\+{" end="}" contains=@initngServiceCluster
 syn cluster initngServiceCluster	contains=initngComment,initngAction,initngServiceOption,initngServiceHeader,initngDelim,initngVariable
diff --git a/uvim/runtime/syntax/inittab.vim b/uvim/runtime/syntax/inittab.mnv
index fc5adfc348..2ec9cd4d61 100644
--- a/uvim/runtime/syntax/inittab.vim
+++ b/uvim/runtime/syntax/inittab.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: SysV-compatible init process control file `inittab'
 " Maintainer: Donovan Keohane <donovan.keohane@gmail.com>
 " Previous Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
diff --git a/uvim/runtime/syntax/ipfilter.vim b/uvim/runtime/syntax/ipfilter.mnv
index c00762623f..c2fc48f937 100644
--- a/uvim/runtime/syntax/ipfilter.vim
+++ b/uvim/runtime/syntax/ipfilter.mnv
@@ -3,7 +3,7 @@
 " Maintainer: Hendrik Scholz <hendrik@scholz.net>
 " Last Change: 2022 Jun 14
 "
-" http://www.wormulon.net/files/misc/ipfilter.vim
+" http://www.wormulon.net/files/misc/ipfilter.mnv
 "
 " This will also work for OpenBSD pf but there might be some tags that are
 " not correctly identified.
diff --git a/uvim/runtime/syntax/ipkg.vim b/uvim/runtime/syntax/ipkg.mnv
index 218c243983..8b2e880683 100644
--- a/uvim/runtime/syntax/ipkg.vim
+++ b/uvim/runtime/syntax/ipkg.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Ipkg
-" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim), Serhii Khoma <srghma@gmail.com>
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-mnv), Serhii Khoma <srghma@gmail.com>
 " Last Change: 2020 May 19
 " Version:     0.1
 " Author:      ShinKage
-" License:     Vim (see :h license)
-" Repository:  https://github.com/ShinKage/idris2-nvim
+" License:     MNV (see :h license)
+" Repository:  https://github.com/ShinKage/idris2-nmnv
 "
 " Syntax highlight for Idris 2 Package Descriptors (idris-lang.org)
 "
@@ -16,7 +16,7 @@ endif
 
 " we want to use line continuations (\) BEGINNING
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword ipkgKey
     \ package
diff --git a/uvim/runtime/syntax/ishd.vim b/uvim/runtime/syntax/ishd.mnv
index 3c468e361f..788657cd3c 100644
--- a/uvim/runtime/syntax/ishd.vim
+++ b/uvim/runtime/syntax/ishd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	InstallShield Script
 " Maintainer:	Robert M. Cortopassi <cortopar@mindspring.com>
 " Last Change:	2001 May 09
@@ -406,4 +406,4 @@ hi def link ishdHashIf0	    Comment
 
 let b:current_syntax = "ishd"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/iss.vim b/uvim/runtime/syntax/iss.mnv
index 212c0f6dbe..e1a0ea017a 100644
--- a/uvim/runtime/syntax/iss.vim
+++ b/uvim/runtime/syntax/iss.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
 " Maintainer:           Jason Mills (jmills@cs.mun.ca)
 " Previous Maintainer:  Dominique Stéphan (dominique@mggen.com)
@@ -135,4 +135,4 @@ hi def link issTasksFlags		Keyword
 
 let b:current_syntax = "iss"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/ist.vim b/uvim/runtime/syntax/ist.mnv
index e34edac272..879e677394 100644
--- a/uvim/runtime/syntax/ist.vim
+++ b/uvim/runtime/syntax/ist.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Makeindex style file, *.ist
 " Maintainer:	Peter Meszaros <pmeszaros@effice.hu>
 " Last Change:	2012 Jan 08 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword=$,@,48-57,_
 
@@ -55,4 +55,4 @@ let b:current_syntax = "ist"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/j.vim b/uvim/runtime/syntax/j.mnv
index a694cb2f1a..ae3f21c58c 100644
--- a/uvim/runtime/syntax/j.vim
+++ b/uvim/runtime/syntax/j.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	J
 " Maintainer:	David Bürgin <dbuergin@gluet.ch>
-" URL:		https://gitlab.com/glts/vim-j
+" URL:		https://gitlab.com/glts/mnv-j
 " Last Change:	2019-11-12
 
 if exists('b:current_syntax')
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax case match
 syntax sync minlines=100
diff --git a/uvim/runtime/syntax/jal.vim b/uvim/runtime/syntax/jal.mnv
index 460bc01752..f4cb6d2907 100644
--- a/uvim/runtime/syntax/jal.vim
+++ b/uvim/runtime/syntax/jal.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JAL
 " Version: 0.1
 " Last Change:	2003 May 11
@@ -233,4 +233,4 @@ hi def link picIdentifier		Identifier
 
 let b:current_syntax = "jal"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/jam.vim b/uvim/runtime/syntax/jam.mnv
index fc7f49d1f0..8d018e8190 100644
--- a/uvim/runtime/syntax/jam.vim
+++ b/uvim/runtime/syntax/jam.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JAM
 " Maintainer:	Ralf Lemke (ralflemk@t-online.de)
 " Last change:	2012 Jan 08 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword=@,48-57,_,-
 
@@ -237,4 +237,4 @@ let b:current_syntax = "jam"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/jargon.vim b/uvim/runtime/syntax/jargon.mnv
index c4b017d9e6..3fdde26755 100644
--- a/uvim/runtime/syntax/jargon.vim
+++ b/uvim/runtime/syntax/jargon.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Jargon File
 " Maintainer:	Dan Church (https://github.com/h3xx)
 " Last Change:	2020 Mar 16
diff --git a/uvim/runtime/syntax/java.vim b/uvim/runtime/syntax/java.mnv
index ee2b06ffd9..21be811ddc 100644
--- a/uvim/runtime/syntax/java.vim
+++ b/uvim/runtime/syntax/java.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Java
 " Maintainer:		Aliaksei Budavei <0x000c70 AT gmail DOT com>
 " Former Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" Repository:		https://github.com/zzzyxwvut/java-vim.git
+" Repository:		https://github.com/zzzyxwvut/java-mnv.git
 " Last Change:		2026 Mar 22
 
-" Please check ":help java.vim" for comments on some of the options
+" Please check ":help java.mnv" for comments on some of the options
 " available.
 
 " Do not aggregate syntax items from circular inclusion.
@@ -33,9 +33,9 @@ else
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.
+"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST MNV 7.0.
 let s:ff = {}
 let s:vv = {}
 let s:vv.ignore_folding = get(g:, 'java_ignore_folding', '')
@@ -67,7 +67,7 @@ endfunction
 
 if !exists("*s:ReportOnce")
   function s:ReportOnce(message) abort
-    echomsg 'syntax/java.vim: ' . a:message
+    echomsg 'syntax/java.mnv: ' . a:message
   endfunction
 else
   function! s:ReportOnce(dummy)
@@ -108,7 +108,7 @@ endtry
 syn match javaError "[\\@`]"
 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
 
-" use separate name so that it can be deleted in javacc.vim
+" use separate name so that it can be deleted in javacc.mnv
 syn match   javaError2 "#\|=<"
 
 " Keywords (JLS-17, §3.9):
@@ -308,7 +308,7 @@ if exists("g:java_highlight_all") || exists("g:java_highlight_java") || exists("
   syn cluster javaClasses add=javaI_JavaLang
   hi def link javaI_JavaLang javaI_Java
 
-  " Common groups for generated "javaid.vim" syntax items:
+  " Common groups for generated "javaid.mnv" syntax items:
   hi def link javaR_Java javaR_
   hi def link javaC_Java javaC_
   hi def link javaE_Java javaE_
@@ -341,7 +341,7 @@ if exists("g:java_highlight_all") || exists("g:java_highlight_java") || exists("
   syn keyword javaLangDeprecated Compiler SecurityManager RuntimePermission
 endif
 
-runtime syntax/javaid.vim
+runtime syntax/javaid.mnv
 
 " Type parameter sections (JLS-17, §4.4, §4.5).
 "
@@ -428,7 +428,7 @@ syn match   javaCommentError contained "/\*"me=e-1 display
 if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:main_syntax != 'jsp'
   " The overridable "html*" and "markdown*" default links must be
   " defined _before_ the inclusion of the same default links from
-  " "html.vim" and "markdown.vim".
+  " "html.mnv" and "markdown.mnv".
   if s:with_html || s:with_markdown
     hi def link htmlComment		Special
     hi def link htmlCommentPart		Special
@@ -456,7 +456,7 @@ if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:mai
 	unlet g:html_syntax_folding
       endif
 
-      syntax include @javaHtml syntax/html.vim
+      syntax include @javaHtml syntax/html.mnv
     finally
       unlet! b:current_syntax
 
@@ -480,7 +480,7 @@ if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:mai
 	unlet g:markdown_fenced_languages
       endif
 
-      syntax include @javaMarkdown syntax/markdown.vim
+      syntax include @javaMarkdown syntax/markdown.mnv
 
       try
 	syn clear markdownId markdownLineStart markdownH1 markdownH2 markdownHeadingRule markdownRule markdownCode markdownCodeBlock markdownIdDeclaration
@@ -574,7 +574,7 @@ if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:mai
 
     unlet s:name
 
-    " COMBAK: Footnotes are recognised by "markdown.vim", but are not
+    " COMBAK: Footnotes are recognised by "markdown.mnv", but are not
     " in CommonMark.  See https://pandoc.org/MANUAL.html#footnotes.
 """"syn match markdownFootnoteDefinition contained "^\s*///\s*\[^[^\]]\+\]:" contains=javaMarkdownCommentMask
 
@@ -901,7 +901,7 @@ if exists("g:java_highlight_functions")
 endif
 
 " The @javaTop cluster comprises non-contained Java syntax groups.
-" Note that the syntax file "aidl.vim" relies on its availability.
+" Note that the syntax file "aidl.mnv" relies on its availability.
 syn cluster javaTop contains=TOP,javaTopEnumDeclaration
 
 if !exists("g:java_minlines")
@@ -989,8 +989,8 @@ let b:spell_options = "contained"
 let &cpo = s:cpo_save
 unlet s:cpo_save s:ff s:vv s:with_html s:with_markdown
 
-" See ":help vim9-mix".
-if !has("vim9script")
+" See ":help mnv9-mix".
+if !has("mnv9script")
   finish
 endif
 
@@ -1015,4 +1015,4 @@ if exists("g:java_foldtext_show_first_or_second_line")
   setlocal foldtext=s:JavaSyntaxFoldTextExpr()
   delfunction! g:JavaSyntaxFoldTextExpr
 endif
-" vim: fdm=syntax sw=2 ts=8 noet sta
+" mnv: fdm=syntax sw=2 ts=8 noet sta
diff --git a/uvim/runtime/syntax/javacc.vim b/uvim/runtime/syntax/javacc.mnv
index a80572d510..a6fe1eafa9 100644
--- a/uvim/runtime/syntax/javacc.vim
+++ b/uvim/runtime/syntax/javacc.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JavaCC, a Java Compiler Compiler written by JavaSoft
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/javacc.vim
+" URL:		http://www.fleiner.com/mnv/syntax/javacc.mnv
 " Last Change:	2012 Oct 05
 
-" Uses java.vim, and adds a few special things for JavaCC Parser files.
+" Uses java.mnv, and adds a few special things for JavaCC Parser files.
 " Those files usually have the extension  *.jj
 
 " quit when a syntax file was already loaded
@@ -13,10 +13,10 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-" source the java.vim file
-runtime! syntax/java.vim
+" source the java.mnv file
+runtime! syntax/java.mnv
 unlet b:current_syntax
 
 "remove catching errors caused by wrong parenthesis (does not work in javacc
@@ -31,7 +31,7 @@ syn clear	javaInParen
 syn clear	javaError2
 
 " remove function definitions (they look different) (first define in
-" in case it was not defined in java.vim)
+" in case it was not defined in java.mnv)
 "syn match javaFuncDef "--"
 syn clear javaFuncDef
 syn match javaFuncDef "[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)[ \t]*:" contains=javaType
@@ -62,4 +62,4 @@ let b:current_syntax = "javacc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/javascript.vim b/uvim/runtime/syntax/javascript.mnv
index c89fcedce6..b6da0f4548 100644
--- a/uvim/runtime/syntax/javascript.vim
+++ b/uvim/runtime/syntax/javascript.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JavaScript
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " Updaters:	Scott Shattuck (ss) <ss@technicalpursuit.com>
-" URL:		http://www.fleiner.com/vim/syntax/javascript.vim
+" URL:		http://www.fleiner.com/mnv/syntax/javascript.mnv
 " Changes:	(ss) added keywords, reserved words, and other identifiers
 "		(ss) repaired several quoting and grouping glitches
 "		(ss) fixed regex parsing issue with multiple qualifiers [gi]
@@ -28,7 +28,7 @@ elseif exists("b:current_syntax") && b:current_syntax == "javascript"
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 
 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
@@ -144,4 +144,4 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/javascriptreact.vim b/uvim/runtime/syntax/javascriptreact.mnv
index 0067a0b352..ae47d75ea2 100644
--- a/uvim/runtime/syntax/javascriptreact.vim
+++ b/uvim/runtime/syntax/javascriptreact.mnv
@@ -1,3 +1,3 @@
 " Placeholder for backwards compatilibity: .jsx used to be associated with the
 " filetpye JavaScript.
-runtime! syntax/javascript.vim
+runtime! syntax/javascript.mnv
diff --git a/uvim/runtime/syntax/jess.vim b/uvim/runtime/syntax/jess.mnv
index 67d3715a30..15ab6893a5 100644
--- a/uvim/runtime/syntax/jess.vim
+++ b/uvim/runtime/syntax/jess.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Jess
 " Maintainer:	Paul Baleme <pbaleme@mail.com>
 " Last change:	September 14, 2000
-" Based on lisp.vim by : Dr. Charles E. Campbell, Jr.
+" Based on lisp.mnv by : Dr. Charles E. Campbell, Jr.
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -141,4 +141,4 @@ hi def link jessVar		Identifier
 
 let b:current_syntax = "jess"
 
-" vim: ts=18
+" mnv: ts=18
diff --git a/uvim/runtime/syntax/jgraph.vim b/uvim/runtime/syntax/jgraph.mnv
index a29a21a73b..97d2a064c8 100644
--- a/uvim/runtime/syntax/jgraph.vim
+++ b/uvim/runtime/syntax/jgraph.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	jgraph (graph plotting utility)
 " Maintainer:	Jonas Munsin jmunsin@iki.fi
 " Last Change:	2003 May 04
diff --git a/uvim/runtime/syntax/jinja.vim b/uvim/runtime/syntax/jinja.mnv
index fa32c05f17..2ed0dd901c 100644
--- a/uvim/runtime/syntax/jinja.vim
+++ b/uvim/runtime/syntax/jinja.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Jinja
 " Maintainer: Gregory Anders
-" Upstream: https://gitlab.com/HiPhish/jinja.vim
+" Upstream: https://gitlab.com/HiPhish/jinja.mnv
 " Last Change: 2024 Oct 16
 
 if exists('b:current_syntax') && b:current_syntax =~? 'jinja'
diff --git a/uvim/runtime/syntax/jjdescription.vim b/uvim/runtime/syntax/jjdescription.mnv
index bd1c6f22fd..7df3907bfd 100644
--- a/uvim/runtime/syntax/jjdescription.vim
+++ b/uvim/runtime/syntax/jjdescription.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	jj description
 " Maintainer:	Gregory Anders <greg@gpanders.com>
 " Last Change:	2024 May 8
-" 2025 Apr 17 by Vim Project (don't require space to start comments, #17130)
+" 2025 Apr 17 by MNV Project (don't require space to start comments, #17130)
 
 if exists('b:current_syntax')
   finish
@@ -14,7 +14,7 @@ syn match jjChanged "M .*" contained
 
 syn region jjComment start="^JJ:" end="$" contains=jjAdded,jjRemoved,jjChanged
 
-syn include @jjCommitDiff syntax/diff.vim
+syn include @jjCommitDiff syntax/diff.mnv
 syn region jjCommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@jjCommitDiff
 
 hi def link jjComment Comment
diff --git a/uvim/runtime/syntax/jovial.vim b/uvim/runtime/syntax/jovial.mnv
index 7c63841729..bf529d35eb 100644
--- a/uvim/runtime/syntax/jovial.vim
+++ b/uvim/runtime/syntax/jovial.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: JOVIAL J73
 " Version: 1.2
 " Maintainer: Paul McGinnis <paulmcg@aol.com>
@@ -107,4 +107,4 @@ hi def link jovialTypedef Typedef
 
 let b:current_syntax = "jovial"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/jproperties.vim b/uvim/runtime/syntax/jproperties.mnv
index 628c03097f..329326d556 100644
--- a/uvim/runtime/syntax/jproperties.vim
+++ b/uvim/runtime/syntax/jproperties.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Java Properties resource file (*.properties[_*])
 " Maintainer:	Simon Baldwin <simonb@sco.com>
 " Last change:	26th Mar 2000
@@ -132,4 +132,4 @@ hi def link jpropertiesError	Error
 
 let b:current_syntax = "jproperties"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/jq.vim b/uvim/runtime/syntax/jq.mnv
index 3275e2ef5e..89f5d0e7fc 100644
--- a/uvim/runtime/syntax/jq.vim
+++ b/uvim/runtime/syntax/jq.mnv
@@ -1,9 +1,9 @@
-" Vim compiler file
+" MNV compiler file
 " Language:	jq
 " Maintainer:	Vito <vito.blog@gmail.com>
 " Last Change:	2024 Apr 17
-" Upstream: https://github.com/vito-c/jq.vim
-" 2025 Apr 16 by Vim Project (set 'cpoptions' for line continuation, #17121)
+" Upstream: https://github.com/vito-c/jq.mnv
+" 2025 Apr 16 by MNV Project (set 'cpoptions' for line continuation, #17121)
 "
 " Quit when a (custom) syntax file was already loaded
 if exists('b:current_syntax')
@@ -11,9 +11,9 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-" syn include @jqHtml syntax/html.vim  " Doc comment HTML
+" syn include @jqHtml syntax/html.mnv  " Doc comment HTML
 
 " jqTodo
 syntax keyword jqTodo contained TODO FIXME NOTE XXX
diff --git a/uvim/runtime/syntax/json.vim b/uvim/runtime/syntax/json.mnv
index f61a17e120..facb001753 100644
--- a/uvim/runtime/syntax/json.vim
+++ b/uvim/runtime/syntax/json.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JSON
 " Maintainer:	Vito <vito.blog@gmail.com>
 " Previous Maintainer:	Eli Parra <eli@elzr.com>
@@ -20,7 +20,7 @@ syntax match   jsonNoise           /\%(:\|,\)/
 " Syntax: JSON Keywords
 " Separated into a match and region because a region by itself is always greedy
 syn match  jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
-if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1)
+if has('conceal') && (!exists("g:mnv_json_conceal") || g:mnv_json_conceal==1)
    syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contained
 else
    syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contained
@@ -31,7 +31,7 @@ endif
 " Needs to come after keywords or else a json encoded string will break the
 " syntax
 syn match  jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
-if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1)
+if has('conceal') && (!exists("g:mnv_json_conceal") || g:mnv_json_conceal==1)
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ concealends contains=jsonEscape contained
 else
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ contains=jsonEscape contained
@@ -49,7 +49,7 @@ syn match   jsonEscape    "\\u\x\{4}" contained
 syn match   jsonNumber    "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>\ze[[:blank:]\r\n]*[,}\]]"
 
 " ERROR WARNINGS **********************************************
-if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
+if (!exists("g:mnv_json_warnings") || g:mnv_json_warnings==1)
 	" Syntax: Strings should always be enclosed with quotes.
 	syn match   jsonNoQuotesError  "\<[[:alpha:]][[:alnum:]]*\>"
 	syn match   jsonTripleQuotesError  /"""/
@@ -107,7 +107,7 @@ hi def link jsonNull            Function
 hi def link jsonBoolean         Boolean
 hi def link jsonKeyword         Label
 
-if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
+if (!exists("g:mnv_json_warnings") || g:mnv_json_warnings==1)
 hi def link jsonNumError        Error
 hi def link jsonCommentError    Error
 hi def link jsonSemicolonError  Error
@@ -125,8 +125,8 @@ if main_syntax == 'json'
   unlet main_syntax
 endif
 
-" Vim settings
-" vim: ts=8 fdm=marker
+" MNV settings
+" mnv: ts=8 fdm=marker
 
 " MIT License
 " Copyright (c) 2013, Jeroen Ruigrok van der Werven, Eli Parra
diff --git a/uvim/runtime/syntax/json5.vim b/uvim/runtime/syntax/json5.mnv
index dc0d11b2a1..d021c2d207 100644
--- a/uvim/runtime/syntax/json5.vim
+++ b/uvim/runtime/syntax/json5.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     JSON5
 " Maintainer:   Mazunki Hoksaas rolferen@gmail.com
 " Previous Maintainer: Guten Ye <ywzhaifei@gmail.com>
 " Last Change:  2019 Apr 1
-" Version:      vim9.0-1
+" Version:      mnv9.0-1
 " URL:          https://github.com/json5/json5
 
 " Syntax setup
diff --git a/uvim/runtime/syntax/jsonc.vim b/uvim/runtime/syntax/jsonc.mnv
index d0df16bbf1..e78a27996a 100644
--- a/uvim/runtime/syntax/jsonc.vim
+++ b/uvim/runtime/syntax/jsonc.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         JSONC (JSON with Comments)
 " Original Author:  Izhak Jakov <izhak724@gmail.com>
-" Acknowledgement:  Based off of vim-jsonc maintained by Kevin Locke <kevin@kevinlocke.name>
-"                   https://github.com/kevinoid/vim-jsonc
+" Acknowledgement:  Based off of mnv-jsonc maintained by Kevin Locke <kevin@kevinlocke.name>
+"                   https://github.com/kevinoid/mnv-jsonc
 " License:          MIT
 " Last Change:      2021-07-01
 
@@ -15,11 +15,11 @@ if !exists('g:main_syntax')
   let g:main_syntax = 'jsonc'
 endif
 
-" Based on vim-json syntax
-runtime! syntax/json.vim
+" Based on mnv-json syntax
+runtime! syntax/json.mnv
 
 " Remove syntax group for comments treated as errors
-if !exists("g:vim_json_warnings") || g:vim_json_warnings
+if !exists("g:mnv_json_warnings") || g:mnv_json_warnings
   syn clear jsonCommentError
 endif
 
diff --git a/uvim/runtime/syntax/jsp.vim b/uvim/runtime/syntax/jsp.mnv
index 1c3cc35a31..66381b32eb 100644
--- a/uvim/runtime/syntax/jsp.vim
+++ b/uvim/runtime/syntax/jsp.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	JSP (Java Server Pages)
 " Maintainer:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
-" URL:		http://rgarciasuarez.free.fr/vim/syntax/jsp.vim
+" URL:		http://rgarciasuarez.free.fr/mnv/syntax/jsp.mnv
 " Last change:	2004 Feb 02
 " Credits : Patch by Darren Greaves (recognizes <jsp:...> tags)
 "	    Patch by Thomas Kimpton (recognizes jspExpr inside HTML tags)
@@ -16,14 +16,14 @@ if !exists("main_syntax")
 endif
 
 " Source HTML syntax
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 " Next syntax items are case-sensitive
 syn case match
 
 " Include Java syntax
-syn include @jspJava syntax/java.vim
+syn include @jspJava syntax/java.mnv
 
 syn region jspScriptlet matchgroup=jspTag start=/<%/  keepend end=/%>/ contains=@jspJava
 syn region jspComment			  start=/<%--/	      end=/--%>/
@@ -46,7 +46,7 @@ syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,h
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-" java.vim has redefined htmlComment highlighting
+" java.mnv has redefined htmlComment highlighting
 hi def link htmlComment	 Comment
 hi def link htmlCommentPart Comment
 " Be consistent with html highlight settings
@@ -65,4 +65,4 @@ endif
 
 let b:current_syntax = "jsp"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/julia.vim b/uvim/runtime/syntax/julia.mnv
index 99a0a1a8c8..2d37b69f00 100644
--- a/uvim/runtime/syntax/julia.vim
+++ b/uvim/runtime/syntax/julia.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
-" Homepage:	https://github.com/JuliaEditorSupport/julia-vim
+" Homepage:	https://github.com/JuliaEditorSupport/julia-mnv
 " Last Change:	2021 Aug 04
-"		2025 Dec 08 by Vim Project (update syntax script from upstream #18894)
+"		2025 Dec 08 by MNV Project (update syntax script from upstream #18894)
 
 if version < 600
   syntax clear
@@ -12,11 +12,11 @@ elseif exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if version < 704
   " this is used to disable regex syntax like `\@3<='
-  " on older vim versions
+  " on older mnv versions
   function! s:d(x)
     return ''
   endfunction
@@ -217,7 +217,7 @@ syntax match   juliaBaseTypeTime	display "\<\%(Date\%(Time\)\?\|DateFormat\)\>"
 syntax match   juliaBaseTypeOther	display "\<\%(RemoteRef\|Task\|Condition\|VersionNumber\|IPv[46]\|SerializationState\|WorkerConfig\|Future\|RemoteChannel\|IPAddr\|Stack\%(Trace\|Frame\)\|\(Caching\|Worker\)Pool\|AbstractSerializer\)\>"
 
 syntax match   juliaConstNum		display "\%(\<\%(\%(NaN\|Inf\)\%(16\|32\|64\)\?\|pi\|π\)\>\)"
-" Note: recognition of ℯ, which Vim does not consider a valid identifier, is
+" Note: recognition of ℯ, which MNV does not consider a valid identifier, is
 " complicated. We detect possible uses by just looking for the character (for
 " performance) and then check that it's actually used by its own.
 " (This also tries to detect preceding number constants; it does so in a crude
diff --git a/uvim/runtime/syntax/just.vim b/uvim/runtime/syntax/just.mnv
index 79c81d0f9c..8d4440f23a 100644
--- a/uvim/runtime/syntax/just.vim
+++ b/uvim/runtime/syntax/just.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Justfile
 " Maintainer:	Peter Benjamin <@pbnj>
 " Last Change:	2025 Jan 25
-" Credits:	The original author, Noah Bogart <https://github.com/NoahTheDuke/vim-just/>
+" Credits:	The original author, Noah Bogart <https://github.com/NoahTheDuke/mnv-just/>
 
 if exists('b:current_syntax')
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = 'just'
 
@@ -320,13 +320,13 @@ syn match justOptionalFile '\V?' contained
 
 " Most linked colorscheme colors are chosen based on semantics of the color name.
 " Some are for parity with other syntax files (for example, Number for recipe body highlighting
-" is to align with the make.vim distributed with Vim).
+" is to align with the make.mnv distributed with MNV).
 " Deprecated `just` syntaxes are highlighted as Underlined.
 "
 " Colors are linked 'def'(ault) so that users who prefer other colors
-" can override them, e.g. in ~/.vim/after/syntax/just.vim
+" can override them, e.g. in ~/.mnv/after/syntax/just.mnv
 "
-" Note that vim-just's highlight groups are an implementation detail and may be subject to change.
+" Note that mnv-just's highlight groups are an implementation detail and may be subject to change.
 
 " The list of highlight links is sorted alphabetically.
 
diff --git a/uvim/runtime/syntax/karel.vim b/uvim/runtime/syntax/karel.mnv
index 85c78529e6..dffeabcf88 100644
--- a/uvim/runtime/syntax/karel.vim
+++ b/uvim/runtime/syntax/karel.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    KAREL
 " Last Change: 2024-11-17
 " Maintainer:  Kirill Morozov <kirill@robotix.pro>
diff --git a/uvim/runtime/syntax/kconfig.vim b/uvim/runtime/syntax/kconfig.mnv
index 64a47a5995..699c4309ff 100644
--- a/uvim/runtime/syntax/kconfig.vim
+++ b/uvim/runtime/syntax/kconfig.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2025 Jan 20
-" License:              Vim (see :h license)
-" Repository:		https://github.com/chrisbra/vim-kconfig
+" License:              MNV (see :h license)
+" Repository:		https://github.com/chrisbra/mnv-kconfig
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 exe "syn sync minlines=" . get(g:, 'kconfig_minlines', 50)
 
diff --git a/uvim/runtime/syntax/kdl.vim b/uvim/runtime/syntax/kdl.mnv
index 97e8f93b61..4f810748ee 100644
--- a/uvim/runtime/syntax/kdl.vim
+++ b/uvim/runtime/syntax/kdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: KDL
 " Maintainer: Aram Drevekenin <aram@poor.dev>
 " Maintainer: Yinzuo Jiang <jiangyinzuo@foxmail.com>
@@ -45,4 +45,4 @@ hi def link kdlNumber      Number
 
 let b:current_syntax = "kdl"
 
-" vim: sw=2 sts=2 et
+" mnv: sw=2 sts=2 et
diff --git a/uvim/runtime/syntax/kitty.vim b/uvim/runtime/syntax/kitty.mnv
index 6d37b664db..627d69a6e2 100644
--- a/uvim/runtime/syntax/kitty.vim
+++ b/uvim/runtime/syntax/kitty.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:          Kitty configuration files
 " Maintainer:        MD. Mouinul Hossain Shawon <mdmouinulhossainshawon [at] gmail.com>
 " Last Change:       Tue Sep 16 19:10:59 +06 2025
diff --git a/uvim/runtime/syntax/kivy.vim b/uvim/runtime/syntax/kivy.mnv
index d4bccfc147..21cfb1d476 100644
--- a/uvim/runtime/syntax/kivy.vim
+++ b/uvim/runtime/syntax/kivy.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Kivy
 " Maintainer:  Corey Prophitt <corey@prophitt.me>
 " Last Change: Jul 31st, 2024
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " Load Python syntax first (Python can be used within Kivy)
-syn include @pyth $VIMRUNTIME/syntax/python.vim
+syn include @pyth $MNVRUNTIME/syntax/python.mnv
 
 " Kivy language rules can be found here
 "   https://kivy.org/doc/stable/guide/lang.html
@@ -33,4 +33,4 @@ hi def link kivyAttribute Label
 
 let b:current_syntax = "kivy"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/kix.vim b/uvim/runtime/syntax/kix.mnv
index dd74378366..c47a5821cd 100644
--- a/uvim/runtime/syntax/kix.vim
+++ b/uvim/runtime/syntax/kix.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	KixTart 95, Kix2001 Windows script language http://kixtart.org/
 " Maintainer:	Richard Howarth <rhowarth@sgb.co.uk>
 " Last Change:	2003 May 11
@@ -10,7 +10,7 @@
 " 26 April 2001: RMH
 "    Removed development comments from distro version
 "    Renamed "Kix*" to "kix*" for consistancy
-"    Changes made in preperation for VIM version 5.8/6.00
+"    Changes made in preperation for MNV version 5.8/6.00
 
 " TODO:
 "	Handle arrays highlighting
@@ -167,4 +167,4 @@ hi def link kixForEachOK		Conditional
 
 let b:current_syntax = "kix"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/kotlin.vim b/uvim/runtime/syntax/kotlin.mnv
index 9b85b8ef5c..a60beedec8 100644
--- a/uvim/runtime/syntax/kotlin.vim
+++ b/uvim/runtime/syntax/kotlin.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Kotlin
 " Maintainer:   Alexander Udalov
-" URL:          https://github.com/udalov/kotlin-vim
+" URL:          https://github.com/udalov/kotlin-mnv
 " Last Change:  30 December 2022
 
 if exists('b:current_syntax')
@@ -18,7 +18,7 @@ syn keyword ktException try catch finally throw
 syn keyword ktInclude import package
 
 " Generated stdlib class names {{{
-" The following is generated by https://github.com/udalov/kotlin-vim/blob/master/extra/generate-stdlib-class-names.main.kts
+" The following is generated by https://github.com/udalov/kotlin-mnv/blob/master/extra/generate-stdlib-class-names.main.kts
 syn keyword ktType AbstractCollection AbstractCoroutineContextElement AbstractCoroutineContextKey AbstractDoubleTimeSource AbstractIterator AbstractList AbstractLongTimeSource
 syn keyword ktType AbstractMap AbstractMutableCollection AbstractMutableList AbstractMutableMap AbstractMutableSet AbstractSet AccessDeniedException Accessor Annotation
 syn keyword ktType AnnotationRetention AnnotationTarget Any Appendable ArithmeticException Array ArrayDeque ArrayList AssertionError Boolean BooleanArray BooleanIterator
@@ -154,4 +154,4 @@ hi def link ktArrow Structure
 
 let b:current_syntax = 'kotlin'
 
-" vim:foldmethod=marker
+" mnv:foldmethod=marker
diff --git a/uvim/runtime/syntax/krl.vim b/uvim/runtime/syntax/krl.mnv
index 328c6b46f5..f20b27804f 100644
--- a/uvim/runtime/syntax/krl.vim
+++ b/uvim/runtime/syntax/krl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Kuka Robot Language
 " Maintainer: Patrick Meiser-Knosowski <knosowski@graeffrobotics.de>
 " Version: 3.1.0
@@ -20,7 +20,7 @@ if exists("b:current_syntax")
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " if colorscheme is tortus(less)? krlGroupName defaults to 1
 if get(g:, 'colors_name', " ") =~ '\<tortus'
@@ -483,4 +483,4 @@ unlet s:keepcpo
 let b:current_syntax = "krl"
 " }}} Finish
 
-" vim:sw=2 sts=2 et fdm=marker
+" mnv:sw=2 sts=2 et fdm=marker
diff --git a/uvim/runtime/syntax/kscript.vim b/uvim/runtime/syntax/kscript.mnv
index e6776208d4..4a04f21ed3 100644
--- a/uvim/runtime/syntax/kscript.vim
+++ b/uvim/runtime/syntax/kscript.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	kscript
 " Maintainer:	Thomas Capricelli <orzel@yalbi.com>
-" URL:		http://aquila.rezel.enst.fr/thomas/vim/kscript.vim
-" CVS:		$Id: kscript.vim,v 1.1 2004/06/13 17:40:02 vimboss Exp $
+" URL:		http://aquila.rezel.enst.fr/thomas/mnv/kscript.mnv
+" CVS:		$Id: kscript.mnv,v 1.1 2004/06/13 17:40:02 mnvboss Exp $
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -54,4 +54,4 @@ hi def link kscriptHardCoded		Statement
 
 let b:current_syntax = "kscript"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/kwt.vim b/uvim/runtime/syntax/kwt.mnv
index ecda5bb985..1a6fc8af72 100644
--- a/uvim/runtime/syntax/kwt.vim
+++ b/uvim/runtime/syntax/kwt.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	kimwitu++
 " Maintainer:	Michael Piefel <entwurf@piefel.de>
 " Last Change:	2 May 2001
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 unlet b:current_syntax
 
 " kimwitu++ extentions
@@ -67,4 +67,4 @@ syn sync lines=300
 
 let b:current_syntax = "kwt"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lace.vim b/uvim/runtime/syntax/lace.mnv
index 9a83851f2b..2f2dcc27b1 100644
--- a/uvim/runtime/syntax/lace.vim
+++ b/uvim/runtime/syntax/lace.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		lace
 " Maintainer:	Jocelyn Fiat <utilities@eiffel.com>
 " Last Change:	2001 May 09
@@ -119,4 +119,4 @@ hi def link laceTodo				Todo
 
 let b:current_syntax = "lace"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/latte.vim b/uvim/runtime/syntax/latte.mnv
index e30ae42e38..3cb9fb3a21 100644
--- a/uvim/runtime/syntax/latte.vim
+++ b/uvim/runtime/syntax/latte.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Latte
 " Maintainer:	Nick Moffitt, <nick@zork.net>
 " Last Change:	14 June, 2000
diff --git a/uvim/runtime/syntax/lc.vim b/uvim/runtime/syntax/lc.mnv
index 1991c1b582..e053642575 100644
--- a/uvim/runtime/syntax/lc.vim
+++ b/uvim/runtime/syntax/lc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Elsa
 " Maintainer:   Miles Glapa-Grossklag <miles@glapa-grossklag.com>
 " Last Change:  2023-01-29
diff --git a/uvim/runtime/syntax/ld.vim b/uvim/runtime/syntax/ld.mnv
index 7ac050131b..7a7ee6ec7e 100644
--- a/uvim/runtime/syntax/ld.vim
+++ b/uvim/runtime/syntax/ld.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             ld(1) script
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword ldTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/ldapconf.vim b/uvim/runtime/syntax/ldapconf.mnv
index 662ea203be..d588ce5f99 100644
--- a/uvim/runtime/syntax/ldapconf.vim
+++ b/uvim/runtime/syntax/ldapconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             ldap.conf(5) configuration file.
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-12-11
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword ldapconfTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/ldif.vim b/uvim/runtime/syntax/ldif.mnv
index 576e4c023d..65b483ccfc 100644
--- a/uvim/runtime/syntax/ldif.vim
+++ b/uvim/runtime/syntax/ldif.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	LDAP LDIF
 " Maintainer:	Zak Johnson <zakj@nox.cx>
 " Last Change:	2003-12-30
diff --git a/uvim/runtime/syntax/leex.vim b/uvim/runtime/syntax/leex.mnv
index 05f92c3748..31098daee4 100644
--- a/uvim/runtime/syntax/leex.vim
+++ b/uvim/runtime/syntax/leex.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Leex (Erlang Lexical Analyzer Generator)
 " Maintainer:   Jon Parise <jon@indelible.org>
 " Last Change:  2025 Nov 30
@@ -11,7 +11,7 @@ if exists('b:current_syntax')
   finish
 endif
 
-syn include @leexErlang syntax/erlang.vim
+syn include @leexErlang syntax/erlang.mnv
 unlet! b:current_syntax
 
 syn match leexComment "%.*$" contains=@Spell display
diff --git a/uvim/runtime/syntax/less.vim b/uvim/runtime/syntax/less.mnv
index c44f0775f2..2e66dae7bb 100644
--- a/uvim/runtime/syntax/less.vim
+++ b/uvim/runtime/syntax/less.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	less
 " Maintainer:	Alessandro Vioni <jenoma@gmail.com>
-" URL: https://github.com/genoma/vim-less
+" URL: https://github.com/genoma/mnv-less
 " Last Change:	2020 Sep 29
 
 if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/css.vim
+runtime! syntax/css.mnv
 
 syn case ignore
 
@@ -75,4 +75,4 @@ hi def link lessMedia                   cssMedia
 
 let b:current_syntax = "less"
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/lex.vim b/uvim/runtime/syntax/lex.mnv
index b05148e88f..5c33176ae4 100644
--- a/uvim/runtime/syntax/lex.vim
+++ b/uvim/runtime/syntax/lex.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Lex and Flex
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:	Charles E. Campbell
 " Contributor:	Robert A. van Engelen <engelen@acm.org>
 " Version:	18
 " Last Change:	Apr 24, 2020
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -13,9 +13,9 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-let s:Cpath= fnameescape(expand("<sfile>:p:h")."/cpp.vim")
+let s:Cpath= fnameescape(expand("<sfile>:p:h")."/cpp.mnv")
 if !filereadable(s:Cpath)
- for s:Cpath in split(globpath(&rtp,"syntax/cpp.vim"),"\n")
+ for s:Cpath in split(globpath(&rtp,"syntax/cpp.mnv"),"\n")
   if filereadable(fnameescape(s:Cpath))
    let s:Cpath= fnameescape(s:Cpath)
    break
@@ -149,7 +149,7 @@ syn keyword lexCFunctions	yyrestart	yyterminate	yylineno	yycolumno	yyin	yyout
 syn keyword lexCFunctions	input	unput	output		winput		wunput		woutput
 syn keyword lexCFunctions	yyinput	yyunput	yyoutput	yywinput	yywunput	yywoutput
 
-" <c.vim> includes several ALLBUTs; these have to be treated so as to exclude lex* groups
+" <c.mnv> includes several ALLBUTs; these have to be treated so as to exclude lex* groups
 syn cluster cParenGroup		add=lex.*
 syn cluster cDefineGroup	add=lex.*
 syn cluster cPreProcGroup	add=lex.*
@@ -187,4 +187,4 @@ endif
 
 let b:current_syntax = "lex"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/lf.vim b/uvim/runtime/syntax/lf.mnv
index fe46fc43b3..8dfec70c90 100644
--- a/uvim/runtime/syntax/lf.vim
+++ b/uvim/runtime/syntax/lf.mnv
@@ -1,17 +1,17 @@
-" Vim syntax file
+" MNV syntax file
 " Language: lf file manager configuration file (lfrc)
 " Maintainer: Andis Sprinkis <andis@sprinkis.com>, @CatsDeservePets
 " Former Maintainer: Cameron Wright
-" URL: https://github.com/andis-sprinkis/lf-vim
+" URL: https://github.com/andis-sprinkis/lf-mnv
 " Last Change: 4 Feb 2026
 "
-" The shell syntax highlighting is configurable. See $VIMRUNTIME/doc/syntax.txt
+" The shell syntax highlighting is configurable. See $MNVRUNTIME/doc/syntax.txt
 " lf version: 41
 
 if exists("b:current_syntax") | finish | endif
 
 let s:cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = "lf"
 
@@ -226,7 +226,7 @@ syn match lfSpecial '\v\\(["\\abfnrtv]|\o+)'
 "}}}
 
 "{{{ Shell Script Matching for cmd
-let s:shell_syntax = get(g:, 'lf_shell_syntax', "syntax/sh.vim")
+let s:shell_syntax = get(g:, 'lf_shell_syntax', "syntax/sh.mnv")
 let s:shell_syntax = get(b:, 'lf_shell_syntax', s:shell_syntax)
 
 unlet b:current_syntax
diff --git a/uvim/runtime/syntax/lftp.vim b/uvim/runtime/syntax/lftp.mnv
index 20ddee5bcb..88c03c4a78 100644
--- a/uvim/runtime/syntax/lftp.vim
+++ b/uvim/runtime/syntax/lftp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             lftp(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/lhaskell.vim b/uvim/runtime/syntax/lhaskell.mnv
index a6d98bf031..04f3e470e5 100644
--- a/uvim/runtime/syntax/lhaskell.vim
+++ b/uvim/runtime/syntax/lhaskell.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Haskell with literate comments, Bird style,
 "			Markdown style, TeX style and plain text surrounding
 "			\begin{code} \end{code} blocks
@@ -26,7 +26,7 @@
 "
 "
 " 2004 February 18: New version, based on Ian Lynagh's TeX guessing
-"		    lhaskell.vim, cweb.vim, tex.vim, sh.vim and fortran.vim
+"		    lhaskell.mnv, cweb.mnv, tex.mnv, sh.mnv and fortran.mnv
 " 2004 February 20: Cleaned up the guessing and overriding a bit
 " 2004 February 23: Cleaned up syntax highlighting for \begin{code} and
 "		    \end{code}, added some clarification to the attributions
@@ -84,13 +84,13 @@ endif
 
 " If user wants us to highlight TeX syntax or guess thinks it's TeX, read it.
 if b:lhs_markup == "tex"
-    runtime! syntax/tex.vim
+    runtime! syntax/tex.mnv
     unlet b:current_syntax
-    " Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
+    " Tex.mnv removes "_" from 'iskeyword', but we need it for Haskell.
     setlocal isk+=_
     syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
 elseif b:lhs_markup == "md"
-    runtime! syntax/markdown.vim
+    runtime! syntax/markdown.mnv
     unlet b:current_syntax
     syntax cluster lhsTeXContainer contains=markdown.*
 else
@@ -99,7 +99,7 @@ endif
 
 " Literate Haskell is Haskell in between text, so at least read Haskell
 " highlighting
-syntax include @haskellTop syntax/haskell.vim
+syntax include @haskellTop syntax/haskell.mnv
 
 syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
 syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer
@@ -132,4 +132,4 @@ unlet s:oldcolumn
 
 let b:current_syntax = "lhaskell"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/libao.vim b/uvim/runtime/syntax/libao.mnv
index 1a3bd90cc5..60e3e5bf00 100644
--- a/uvim/runtime/syntax/libao.vim
+++ b/uvim/runtime/syntax/libao.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             libao.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword libaoTodo     contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/lidris2.vim b/uvim/runtime/syntax/lidris2.mnv
index 328ffdf685..4e263d8feb 100644
--- a/uvim/runtime/syntax/lidris2.vim
+++ b/uvim/runtime/syntax/lidris2.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Literate Idris 2
-" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim), Serhii Khoma <srghma@gmail.com>
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-mnv), Serhii Khoma <srghma@gmail.com>
 " Last Change: 2020 May 19
 " Version:     0.1
-" License:     Vim (see :h license)
-" Repository:  https://github.com/ShinKage/idris2-nvim
+" License:     MNV (see :h license)
+" Repository:  https://github.com/ShinKage/idris2-nmnv
 "
 " This is just a minimal adaption of the Literate Haskell syntax file.
 
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 " Read Idris highlighting.
-syntax include @idris2Top syntax/idris2.vim
+syntax include @idris2Top syntax/idris2.mnv
 
 " Recognize blocks of Bird tracks, highlight as Idris.
 syntax region lidris2BirdTrackBlock start="^>" end="\%(^[^>]\)\@=" contains=@idris2Top,lidris2BirdTrack
diff --git a/uvim/runtime/syntax/lifelines.vim b/uvim/runtime/syntax/lifelines.mnv
index ff4692888e..0eabe13a89 100644
--- a/uvim/runtime/syntax/lifelines.vim
+++ b/uvim/runtime/syntax/lifelines.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	LifeLines (v 3.0.62) <http://lifelines.sourceforge.net>
 " Maintainer:	Patrick Texier <p.texier@orsennes.com>
-" Location:	<http://patrick.texier.free.fr/vim/syntax/lifelines.vim>
+" Location:	<http://patrick.texier.free.fr/mnv/syntax/lifelines.mnv>
 " Last Change:	2010 May 7
 
 " option to highlight error obsolete statements
-" add the following line to your .vimrc file :
+" add the following line to your .mnvrc file :
 " let lifelines_deprecated = 1
 
 " For version 5.x: Clear all syntax items
@@ -112,7 +112,7 @@ syn match	lifelinesNumber	"-\=\.\d\+\>"
 syn region lifelinesFoldBlock	start="{" end="}" transparent fold
 
 "catch errors caused by wrong parenthesis
-"adapted from original c.vim written by Bram Moolenaar
+"adapted from original c.mnv written by Bram Moolenaar
 
 syn cluster	lifelinesParenGroup	contains=lifelinesParenError
 syn region	lifelinesParen		transparent start='(' end=')' contains=ALLBUT,@lifelinesParenGroup
@@ -151,4 +151,4 @@ hi def link lifelinesDecl		PreProc
 
 let b:current_syntax = "lifelines"
 
-" vim: ts=8 sw=4
+" mnv: ts=8 sw=4
diff --git a/uvim/runtime/syntax/lilo.vim b/uvim/runtime/syntax/lilo.mnv
index a87dafb734..6dbfac2baa 100644
--- a/uvim/runtime/syntax/lilo.vim
+++ b/uvim/runtime/syntax/lilo.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: lilo configuration (lilo.conf)
 " Maintainer: Niels Horn <niels.horn@gmail.com>
 " Previous Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
diff --git a/uvim/runtime/syntax/limits.vim b/uvim/runtime/syntax/limits.mnv
index 96bd423869..193d776efb 100644
--- a/uvim/runtime/syntax/limits.vim
+++ b/uvim/runtime/syntax/limits.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             limits(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword limitsTodo    contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/liquid.vim b/uvim/runtime/syntax/liquid.mnv
index 966b60f6f8..f68606962b 100644
--- a/uvim/runtime/syntax/liquid.vim
+++ b/uvim/runtime/syntax/liquid.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Liquid
-" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:   Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:    *.liquid
 " Last Change:	2022 Mar 15
 
@@ -31,7 +31,7 @@ if !exists('b:liquid_subtype') && main_syntax == 'liquid'
 endif
 
 if exists('b:liquid_subtype') && b:liquid_subtype != ''
-  exe 'runtime! syntax/'.b:liquid_subtype.'.vim'
+  exe 'runtime! syntax/'.b:liquid_subtype.'.mnv'
   unlet! b:current_syntax
 endif
 
@@ -39,7 +39,7 @@ syn case match
 
 if exists('b:liquid_subtype') && b:liquid_subtype != 'yaml'
   " YAML Front Matter
-  syn include @liquidYamlTop syntax/yaml.vim
+  syn include @liquidYamlTop syntax/yaml.mnv
   unlet! b:current_syntax
   syn region liquidYamlHead start="\%^---$" end="^---\s*$" keepend contains=@liquidYamlTop,@Spell
 endif
@@ -55,7 +55,7 @@ if !exists('s:subtype')
     if s:type =~ '\.'
       let b:{matchstr(s:type,'[^.]*')}_subtype = matchstr(s:type,'\.\zs.*')
     endif
-    exe 'syn include @liquidHighlight'.substitute(s:type,'\.','','g').' syntax/'.matchstr(s:type,'[^.]*').'.vim'
+    exe 'syn include @liquidHighlight'.substitute(s:type,'\.','','g').' syntax/'.matchstr(s:type,'[^.]*').'.mnv'
     unlet! b:current_syntax
   endfor
   unlet! s:type
diff --git a/uvim/runtime/syntax/lisp.vim b/uvim/runtime/syntax/lisp.mnv
index 5350b4dc51..977700b061 100644
--- a/uvim/runtime/syntax/lisp.vim
+++ b/uvim/runtime/syntax/lisp.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Lisp
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:  Charles E. Campbell
 " Last Change: Nov 10, 2021
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:     31
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
-"  Clisp additions courtesy of http://clisp.cvs.sourceforge.net/*checkout*/clisp/clisp/emacs/lisp.vim
+"  Clisp additions courtesy of http://clisp.cvs.sourceforge.net/*checkout*/clisp/clisp/emacs/lisp.mnv
 
 " ---------------------------------------------------------------------
 "  Load Once: {{{1
@@ -621,4 +621,4 @@ endif
 let b:current_syntax = "lisp"
 
 " ---------------------------------------------------------------------
-" vim: ts=8 nowrap fdm=marker
+" mnv: ts=8 nowrap fdm=marker
diff --git a/uvim/runtime/syntax/lite.vim b/uvim/runtime/syntax/lite.mnv
index f6e41e7e18..017c854753 100644
--- a/uvim/runtime/syntax/lite.vim
+++ b/uvim/runtime/syntax/lite.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	lite
 " Maintainer:	Lutz Eymers <ixtab@polzin.com>
-" URL:		http://www.isp.de/data/lite.vim
-" Email:	Subject: send syntax_vim.tgz
+" URL:		http://www.isp.de/data/lite.mnv
+" Email:	Subject: send syntax_mnv.tgz
 " Last Change:	2001 Mai 01
 "
 " Options	lite_sql_query = 1 for SQL syntax highlighting inside strings
@@ -20,7 +20,7 @@ endif
 if main_syntax == 'lite'
   if exists("lite_sql_query")
     if lite_sql_query == 1
-      syn include @liteSql <sfile>:p:h/sql.vim
+      syn include @liteSql <sfile>:p:h/sql.mnv
       unlet b:current_syntax
     endif
   endif
@@ -29,7 +29,7 @@ endif
 if main_syntax == 'msql'
   if exists("msql_sql_query")
     if msql_sql_query == 1
-      syn include @liteSql <sfile>:p:h/sql.vim
+      syn include @liteSql <sfile>:p:h/sql.mnv
       unlet b:current_syntax
     endif
   endif
@@ -165,4 +165,4 @@ if main_syntax == 'lite'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/litestep.vim b/uvim/runtime/syntax/litestep.mnv
index e3d967f010..261a6259a5 100644
--- a/uvim/runtime/syntax/litestep.vim
+++ b/uvim/runtime/syntax/litestep.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             LiteStep RC file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-02-22
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword litestepTodo
       \ contained
diff --git a/uvim/runtime/syntax/livebook.vim b/uvim/runtime/syntax/livebook.mnv
index 133cab01e3..58b8be2615 100644
--- a/uvim/runtime/syntax/livebook.vim
+++ b/uvim/runtime/syntax/livebook.mnv
@@ -5,4 +5,4 @@ if exists("b:current_syntax")
     finish
 endif
 
-runtime! syntax/markdown.vim
+runtime! syntax/markdown.mnv
diff --git a/uvim/runtime/syntax/lnk.vim b/uvim/runtime/syntax/lnk.mnv
index 45ca382aca..c117654aa9 100644
--- a/uvim/runtime/syntax/lnk.vim
+++ b/uvim/runtime/syntax/lnk.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TI linker command file
 " Document:	https://downloads.ti.com/docs/esd/SPRUI03A/Content/SPRUI03A_HTML/linker_description.html
 " Document:	https://software-dl.ti.com/ccs/esd/documents/sdto_cgt_Linker-Command-File-Primer.html
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/cmacro.vim
+runtime! syntax/cmacro.mnv
 
 syn case ignore
 syn match lnkNumber		"0x[0-9a-f]\+"
diff --git a/uvim/runtime/syntax/lnkmap.vim b/uvim/runtime/syntax/lnkmap.mnv
index dc097f412f..0ff72447a8 100644
--- a/uvim/runtime/syntax/lnkmap.vim
+++ b/uvim/runtime/syntax/lnkmap.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TI Linker map
 " Document:	https://downloads.ti.com/docs/esd/SPRUI03A/Content/SPRUI03A_HTML/linker_description.html
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
diff --git a/uvim/runtime/syntax/log.vim b/uvim/runtime/syntax/log.mnv
index abf3d716c2..9f1edf1cb9 100644
--- a/uvim/runtime/syntax/log.vim
+++ b/uvim/runtime/syntax/log.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         Generic log file
 " Maintainer:       Mao-Yining <https://github.com/mao-yining>
 " Former Maintainer:	MTDL9 <https://github.com/MTDL9>
diff --git a/uvim/runtime/syntax/loginaccess.vim b/uvim/runtime/syntax/loginaccess.mnv
index 650e067d18..b06c551601 100644
--- a/uvim/runtime/syntax/loginaccess.vim
+++ b/uvim/runtime/syntax/loginaccess.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             login.access(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword loginaccessTodo           contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/logindefs.vim b/uvim/runtime/syntax/logindefs.mnv
index 51fa19992c..1958c5887d 100644
--- a/uvim/runtime/syntax/logindefs.vim
+++ b/uvim/runtime/syntax/logindefs.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file for login.defs(5)
+" MNV syntax file for login.defs(5)
 " Language:             login.defs(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2010-11-29
-" 2024 Jul 12 by Vim Project: Update keywords
+" 2024 Jul 12 by MNV Project: Update keywords
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   logindefsBegin          display '^'
                                     \ nextgroup=
diff --git a/uvim/runtime/syntax/logtalk.vim b/uvim/runtime/syntax/logtalk.mnv
index 366f888b66..1f8abce968 100644
--- a/uvim/runtime/syntax/logtalk.vim
+++ b/uvim/runtime/syntax/logtalk.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:	Logtalk
 " Maintainer:   Paulo Moura <pmoura@logtalk.org>
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Logtalk is case sensitive:
 
diff --git a/uvim/runtime/syntax/lotos.vim b/uvim/runtime/syntax/lotos.mnv
index 8262e1d9ef..9370a9f9bf 100644
--- a/uvim/runtime/syntax/lotos.vim
+++ b/uvim/runtime/syntax/lotos.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	LOTOS (Language Of Temporal Ordering Specifications, IS8807)
 " Maintainer:	Daniel Amyot <damyot@csi.uottawa.ca>
 " Last Change:	Wed Aug 19 1998
-" URL:		http://lotos.csi.uottawa.ca/~damyot/vim/lotos.vim
-" This file is an adaptation of pascal.vim by Mario Eusebio
+" URL:		http://lotos.csi.uottawa.ca/~damyot/mnv/lotos.mnv
+" This file is an adaptation of pascal.mnv by Mario Eusebio
 " I'm not sure I understand all of the syntax highlight language,
 " but this file seems to do the job for standard LOTOS.
 
@@ -66,4 +66,4 @@ hi def link lotosDelimiter		String
 
 let b:current_syntax = "lotos"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lout.vim b/uvim/runtime/syntax/lout.mnv
index b26a7bcc46..5d53397b16 100644
--- a/uvim/runtime/syntax/lout.vim
+++ b/uvim/runtime/syntax/lout.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Lout
 " Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change: So 12 Feb 2012 15:15:03 CET
 " Filenames:   *.lout,*.lt
-" URL:         http://www.cvjb.de/comp/vim/lout.vim
+" URL:         http://www.cvjb.de/comp/mnv/lout.mnv
 
-" $Id: lout.vim,v 1.4 2012/02/12 15:16:17 bruessow Exp $
+" $Id: lout.mnv,v 1.4 2012/02/12 15:16:17 bruessow Exp $
 "
 " Lout: Basser Lout document formatting system.
 
@@ -13,7 +13,7 @@
 " 
 " 2012-02-12:
 " Thilo Six <T.Six at gmx dot de> send a patch for cpoptions.
-" See the discussion at http://thread.gmane.org/gmane.editors.vim.devel/32151
+" See the discussion at http://thread.gmane.org/gmane.editors.mnv.devel/32151
 
 
 " quit when a syntax file was already loaded
@@ -22,7 +22,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save=&cpo
-set cpo&vim
+set cpo&mnv
 
 " Lout is case sensitive
 syn case match
@@ -132,4 +132,4 @@ let b:current_syntax = "lout"
 let &cpo=s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8:sw=4:nocindent:smartindent:
+" mnv:ts=8:sw=4:nocindent:smartindent:
diff --git a/uvim/runtime/syntax/lpc.vim b/uvim/runtime/syntax/lpc.mnv
index 7d85fce8e2..1efd5be4c2 100644
--- a/uvim/runtime/syntax/lpc.vim
+++ b/uvim/runtime/syntax/lpc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	LPC
 " Maintainer:	Shizhu Pan <poet@mudbuilder.net>
-" URL:		http://poet.tomud.com/pub/lpc.vim.bz2
+" URL:		http://poet.tomud.com/pub/lpc.mnv.bz2
 " Last Change:	2016 Aug 31
-" Comments:	If you are using Vim 6.2 or later, see :h lpc.vim for
+" Comments:	If you are using MNV 6.2 or later, see :h lpc.mnv for
 "		file type recognizing, if not, you had to use modeline.
 
 
@@ -15,7 +15,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Nodule: Keywords {{{1
 
@@ -174,14 +174,14 @@ syn keyword     lpcConstant     MUD_NAME F__THIS_OBJECT
 " for C and LPC. That is the reason why I don't change variables like
 " "c_no_utf"s to "lpc_no_utf"s.
 "
-" Copy : Some of the following seems to be copied from c.vim but not quite
+" Copy : Some of the following seems to be copied from c.mnv but not quite
 " the same in details because the syntax for C and LPC is different.
 "
 " Color scheme : this syntax file had been thouroughly tested to work well
-" for all of the dark-backgrounded color schemes Vim has provided officially,
+" for all of the dark-backgrounded color schemes MNV has provided officially,
 " and it should be quite Ok for all of the bright-backgrounded color schemes,
 " of course it works best for the color scheme that I am using, download it
-" from http://poet.tomud.com/pub/ps_color.vim.bz2 if you want to try it.
+" from http://poet.tomud.com/pub/ps_color.mnv.bz2 if you want to try it.
 "
 
 " Nodule: String and Character {{{1
@@ -443,5 +443,5 @@ let b:current_syntax = "lpc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8:nosta:sw=2:ai:si:
-" vim600:set fdm=marker: }}}1
+" mnv:ts=8:nosta:sw=2:ai:si:
+" mnv600:set fdm=marker: }}}1
diff --git a/uvim/runtime/syntax/lprolog.vim b/uvim/runtime/syntax/lprolog.mnv
index 85c3537fed..15a8c36b03 100644
--- a/uvim/runtime/syntax/lprolog.vim
+++ b/uvim/runtime/syntax/lprolog.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     LambdaProlog (Teyjus)
 " Filenames:    *.mod *.sig
 " Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
-" URL:          http://www.ocaml.info/vim/syntax/lprolog.vim
+" URL:          http://www.ocaml.info/mnv/syntax/lprolog.mnv
 " Last Change:  2006 Feb 05
-"               2001 Apr 26 - Upgraded for new Vim version
+"               2001 Apr 26 - Upgraded for new MNV version
 "               2000 Jun  5 - Initial release
 
 " quit when a syntax file was already loaded
@@ -121,4 +121,4 @@ hi def link lprologClause	    Type
 
 let b:current_syntax = "lprolog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lscript.vim b/uvim/runtime/syntax/lscript.mnv
index 3c4a0fffda..fc887f88a8 100644
--- a/uvim/runtime/syntax/lscript.vim
+++ b/uvim/runtime/syntax/lscript.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	LotusScript
 " Maintainer:	Taryn East (taryneast@hotmail.com)
 " Last Change:	2003 May 11
 
 " This is a rough  amalgamation of the visual basic syntax file, and the UltraEdit
 " and Textpad syntax highlighters.
-" It's not too brilliant given that a) I've never written a syntax.vim file before
+" It's not too brilliant given that a) I've never written a syntax.mnv file before
 " and b) I'm not so crash hot at LotusScript either. If you see any problems
 " feel free to email me with them.
 
@@ -197,4 +197,4 @@ hi def link lscriptTypeSpecifier	Type
 
 let b:current_syntax = "lscript"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lsl.vim b/uvim/runtime/syntax/lsl.mnv
index 3b2baa06ce..6f2482dbb5 100644
--- a/uvim/runtime/syntax/lsl.vim
+++ b/uvim/runtime/syntax/lsl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Linden Scripting Language
 " Maintainer:	Timo Frenay <timo@frenay.net>
 " Last Change:	2012 Apr 30
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Initializations
 syn case match
@@ -274,4 +274,4 @@ let b:current_syntax = "lsl"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lss.vim b/uvim/runtime/syntax/lss.mnv
index eceaf75674..17403d9ee5 100644
--- a/uvim/runtime/syntax/lss.vim
+++ b/uvim/runtime/syntax/lss.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Lynx 2.7.1 style file
 " Maintainer:	Scott Bigham <dsb@killerbunnies.org>
 " Last Change:	2004 Oct 06
@@ -120,4 +120,4 @@ hi def lssWhiteBg		ctermbg=white ctermfg=black
 
 let b:current_syntax = "lss"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/lua.vim b/uvim/runtime/syntax/lua.mnv
index f5851d024f..9a86ec6bc4 100644
--- a/uvim/runtime/syntax/lua.vim
+++ b/uvim/runtime/syntax/lua.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Lua 4.0, Lua 5.0, Lua 5.1, Lua 5.2 and Lua 5.3
 " Maintainer:   Marcus Aurelius Farias <masserahguard-lua 'at' yahoo com>
 " First Author: Carlos Augusto Teixeira Mendes <cmendes 'at' inf puc-rio br>
@@ -14,9 +14,9 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-" keep in sync with ftplugin/lua.vim
+" keep in sync with ftplugin/lua.mnv
 if !exists("lua_version")
   " Default is lua 5.3
   let lua_version = 5
@@ -440,4 +440,4 @@ let b:current_syntax = "lua"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: et ts=8 sw=2
+" mnv: et ts=8 sw=2
diff --git a/uvim/runtime/syntax/luau.vim b/uvim/runtime/syntax/luau.mnv
index 59eccac100..abfb6caaff 100644
--- a/uvim/runtime/syntax/luau.vim
+++ b/uvim/runtime/syntax/luau.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Luau
 " Maintainer:	None yet
 " Last Change:	2023 Apr 30
@@ -8,8 +8,8 @@ if exists("b:current_syntax")
 endif
 
 " Luau is a superset of lua
-runtime! syntax/lua.vim
+runtime! syntax/lua.mnv
 
 let b:current_syntax = "luau"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet:
+" mnv: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/lynx.vim b/uvim/runtime/syntax/lynx.mnv
index 8e81c7549c..650a3381ef 100644
--- a/uvim/runtime/syntax/lynx.vim
+++ b/uvim/runtime/syntax/lynx.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Lynx Web Browser Configuration (lynx.cfg)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2026 Jan 08
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match lynxStart "^" skipwhite nextgroup=lynxOption
 
@@ -143,4 +143,4 @@ let b:current_syntax = "lynx"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/lyrics.vim b/uvim/runtime/syntax/lyrics.mnv
index 48a5b1171c..f6e0c6d186 100644
--- a/uvim/runtime/syntax/lyrics.vim
+++ b/uvim/runtime/syntax/lyrics.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     LyRiCs
 " Maintainer:   ObserverOfTime <chronobserver@disroot.org>
 " Filenames:    *.lrc
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/m17ndb.vim b/uvim/runtime/syntax/m17ndb.mnv
index 8d63e6f918..9c2d287248 100644
--- a/uvim/runtime/syntax/m17ndb.vim
+++ b/uvim/runtime/syntax/m17ndb.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	m17n database
 " Maintainer:	David Mandelberg <david@mandelberg.org>
 " Last Change:	2025 Feb 21
diff --git a/uvim/runtime/syntax/m3build.vim b/uvim/runtime/syntax/m3build.mnv
index 1a378e8175..0cb53ff1e8 100644
--- a/uvim/runtime/syntax/m3build.vim
+++ b/uvim/runtime/syntax/m3build.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Modula-3 Makefile
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2021 April 15
@@ -7,7 +7,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/m3quake.vim
+runtime! syntax/m3quake.mnv
 
 " Identifiers
 syn match m3buildPredefinedVariable "\<\%(TARGET\|OS_TYPE\|BUILD_DIR\|PKG_USE\|WDROOT\)\>"
@@ -174,4 +174,4 @@ hi def link m3buildProcedure	      Function
 
 let b:current_syntax = "m3build"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/m3quake.vim b/uvim/runtime/syntax/m3quake.mnv
index c202d90e74..06e0a10d8d 100644
--- a/uvim/runtime/syntax/m3quake.vim
+++ b/uvim/runtime/syntax/m3quake.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Modula-3 Quake
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2021 April 15
@@ -71,4 +71,4 @@ hi def link m3quakeTodo	       Todo
 
 let b:current_syntax = "m3quake"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/m4.vim b/uvim/runtime/syntax/m4.mnv
index c993e5864c..66162e15f8 100644
--- a/uvim/runtime/syntax/m4.vim
+++ b/uvim/runtime/syntax/m4.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	M4
 " Maintainer:	Claudio Fleiner (claudio@fleiner.com)
 " Last Change:	2022 Jun 12
-" 2025 Sep 2 by Vim project: fix a few syntax issues #18192
-" 2025 Sep 5 by Vim project: introduce m4Disabled region #18200
-" 2025 Sep 6 by Vim project: remove m4Function heuristics #18211
-" 2025 Sep 6 by Vim project: remove m4Type and m4Function #18223
-" 2025 Sep 15 by Vim project: highlight m4Parameters #18306
+" 2025 Sep 2 by MNV project: fix a few syntax issues #18192
+" 2025 Sep 5 by MNV project: introduce m4Disabled region #18200
+" 2025 Sep 6 by MNV project: remove m4Function heuristics #18211
+" 2025 Sep 6 by MNV project: remove m4Type and m4Function #18223
+" 2025 Sep 15 by MNV project: highlight m4Parameters #18306
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -102,4 +102,4 @@ if main_syntax == 'm4'
   unlet main_syntax
 endif
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/mail.vim b/uvim/runtime/syntax/mail.mnv
index 9beeba69e2..b2c313b3a9 100644
--- a/uvim/runtime/syntax/mail.vim
+++ b/uvim/runtime/syntax/mail.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Mail file
 " Previous Maintainer:	Felix von Leitner <leitner@math.fu-berlin.de>
-" Maintainer:		GI <a@b.c>, where a='gi1242+vim', b='gmail', c='com'
+" Maintainer:		GI <a@b.c>, where a='gi1242+mnv', b='gmail', c='com'
 " Last Change:		Thu 25 Jan 2024 10:34:02 AM EST
 
 " Quit when a syntax file was already loaded
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn spell toplevel
 
diff --git a/uvim/runtime/syntax/mailaliases.vim b/uvim/runtime/syntax/mailaliases.mnv
index a5282aa074..47fc0eccd2 100644
--- a/uvim/runtime/syntax/mailaliases.vim
+++ b/uvim/runtime/syntax/mailaliases.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             aliases(5) local alias database file
 " Previous Maintainer:  Nikolai Weibull <nikolai@bitwi.se>
 " Latest Revision:      2008-04-14
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword mailaliasesTodo         contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/mailcap.vim b/uvim/runtime/syntax/mailcap.mnv
index bd2304064a..6979411622 100644
--- a/uvim/runtime/syntax/mailcap.vim
+++ b/uvim/runtime/syntax/mailcap.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Mailcap configuration file
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2013 Jun 01
@@ -32,4 +32,4 @@ hi def link mailcapString	String
 
 let b:current_syntax = "mailcap"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/make.vim b/uvim/runtime/syntax/make.mnv
index 0e973237a5..d5078cc92a 100644
--- a/uvim/runtime/syntax/make.vim
+++ b/uvim/runtime/syntax/make.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Makefile
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Previous Maintainer:	Claudio Fleiner <claudio@fleiner.com>, Roland Hieber <https://github.com/rohieb>
-" URL:		https://github.com/vim/vim/blob/master/runtime/syntax/make.vim
+" URL:		https://github.com/Project-Tick/Project-Tick/blob/master/runtime/syntax/make.mnv
 " Last Change:	2022 Nov 06
-" 2025 Apr 15 by Vim project: rework Make flavor detection (#17089)
-" 2025 Oct 12 by Vim project: update makeDefine highlighting (#18403)
-" 2025 Oct 25 by Vim project: update makeTargetinDefine highlighting (#18570)
-" 2025 Dec 23 by Vim project: fix too greedy match (#18938)
-" 2025 Dec 23 by Vim project: wrong highlight with paranthesis inside quotes (#18818)
+" 2025 Apr 15 by MNV project: rework Make flavor detection (#17089)
+" 2025 Oct 12 by MNV project: update makeDefine highlighting (#18403)
+" 2025 Oct 25 by MNV project: update makeTargetinDefine highlighting (#18570)
+" 2025 Dec 23 by MNV project: fix too greedy match (#18938)
+" 2025 Dec 23 by MNV project: wrong highlight with paranthesis inside quotes (#18818)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " enable GNU extension when b:make_flavor is not set—detection failed or Makefile is POSIX-compliant
 let s:make_flavor = 'gnu'
@@ -192,4 +192,4 @@ let b:current_syntax = "make"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mallard.vim b/uvim/runtime/syntax/mallard.mnv
index b2a77b0066..9113760f8b 100644
--- a/uvim/runtime/syntax/mallard.vim
+++ b/uvim/runtime/syntax/mallard.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Mallard
 " Maintainer:  Jaromir Hradilek <jhradilek@gmail.com>
-" URL:         https://github.com/jhradilek/vim-syntax
+" URL:         https://github.com/jhradilek/mnv-syntax
 " Last Change: 11 February 2013
 " Description: A syntax file for the Mallard markup language according to
 "              Mallard 1.0 DRAFT as of 2013-02-11.
diff --git a/uvim/runtime/syntax/man.vim b/uvim/runtime/syntax/man.mnv
index dfbb35a700..4e6887324c 100644
--- a/uvim/runtime/syntax/man.vim
+++ b/uvim/runtime/syntax/man.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Man page
-" Maintainer:	Jason Franklin <vim@justemail.net>
+" Maintainer:	Jason Franklin <mnv@justemail.net>
 " Previous Maintainer:	SungHyun Nam <goweol@gmail.com>
 " Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
 " Version Info:
@@ -16,12 +16,12 @@ if exists("b:current_syntax")
 endif
 
 " Get the CTRL-H syntax to handle backspaced text
-runtime! syntax/ctrlh.vim
+runtime! syntax/ctrlh.mnv
 
 syn case ignore
 
 " See notes about hyphenation in s:ParseIntoPageAndSection of
-" autoload/dist/man.vim.
+" autoload/dist/man.mnv.
 syn match  manReference       "\%(\f\+[\u2010-]\%(\n\|\r\n\=\)\s\+\)\=\f\+([1-9]\l*)"
 syn match  manSectionHeading  "^\a.*$"
 syn match  manSubHeading      "^\s\{3\}\a.*$"
@@ -33,7 +33,7 @@ syn match manHeader '\%1l.*'
 exe 'syn match manFooter ''\%' . line('$') . 'l.*'''
 
 if getline(1) =~ '^[a-zA-Z_]\+([23])'
-  syntax include @cCode <sfile>:p:h/c.vim
+  syntax include @cCode <sfile>:p:h/c.mnv
   syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
   syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
 endif
@@ -55,4 +55,4 @@ hi def link manCFuncDefinition Function
 
 let b:current_syntax = "man"
 
-" vim:ts=8 sts=2 sw=2:
+" mnv:ts=8 sts=2 sw=2:
diff --git a/uvim/runtime/syntax/manconf.vim b/uvim/runtime/syntax/manconf.mnv
index 2c17568d87..d48b0cca61 100644
--- a/uvim/runtime/syntax/manconf.vim
+++ b/uvim/runtime/syntax/manconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             man.conf(5) - man configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword manconfTodo         contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/manual.vim b/uvim/runtime/syntax/manual.mnv
index 8388336f25..d4007ce78e 100644
--- a/uvim/runtime/syntax/manual.vim
+++ b/uvim/runtime/syntax/manual.mnv
@@ -1,7 +1,7 @@
-" Vim syntax support file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax support file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " This file is used for ":syntax manual".
 " It installs the Syntax autocommands, but no the FileType autocommands.
@@ -12,7 +12,7 @@ endif
 
 " Load the Syntax autocommands and set the default methods for highlighting.
 if !exists("syntax_on")
-  so <sfile>:p:h/synload.vim
+  so <sfile>:p:h/synload.mnv
 endif
 
 let syntax_manual = 1
@@ -26,5 +26,5 @@ augroup END
 " If the GUI is already running, may still need to install the FileType menu.
 " Don't do it when the 'M' flag is included in 'guioptions'.
 if has("menu") && has("gui_running") && !exists("did_install_syntax_menu") && &guioptions !~# 'M'
-  source $VIMRUNTIME/menu.vim
+  source $MNVRUNTIME/menu.mnv
 endif
diff --git a/uvim/runtime/syntax/maple.vim b/uvim/runtime/syntax/maple.mnv
index b0bd9aaef9..4666095174 100644
--- a/uvim/runtime/syntax/maple.vim
+++ b/uvim/runtime/syntax/maple.mnv
@@ -1,17 +1,17 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Maple V (based on release 4)
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:Charles E. Campbell
 " Last Change:	Mar 26, 2019
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:	17
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_MAPLE
 "
 " Package Function Selection: {{{1
 " Because there are a lot of packages, and because of the potential for namespace
-" clashes, this version of <maple.vim> needs the user to select which, if any,
+" clashes, this version of <maple.mnv> needs the user to select which, if any,
 " package functions should be highlighted.  Select your packages and put into your
-" <.vimrc> none or more of the lines following let ...=1 lines:
+" <.mnvrc> none or more of the lines following let ...=1 lines:
 "
 "   if exists("mvpkg_all")
 "    ...
@@ -621,4 +621,4 @@ endif
 
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
-" vim: ts=20 fdm=marker
+" mnv: ts=20 fdm=marker
diff --git a/uvim/runtime/syntax/markdown.vim b/uvim/runtime/syntax/markdown.mnv
index 44187ff18c..0b0b338c58 100644
--- a/uvim/runtime/syntax/markdown.vim
+++ b/uvim/runtime/syntax/markdown.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Markdown
-" Maintainer:   Tim Pope <https://github.com/tpope/vim-markdown>
+" Maintainer:   Tim Pope <https://github.com/tpope/mnv-markdown>
 " Filenames:    *.markdown
 " Last Change:  2022 Oct 13
 
@@ -18,7 +18,7 @@ if has('folding')
 endif
 let s:iskeyword = &l:iskeyword
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet! b:current_syntax
 
 if !exists('g:markdown_fenced_languages')
@@ -33,7 +33,7 @@ for s:type in map(copy(g:markdown_fenced_languages),'matchstr(v:val,"[^=]*$")')
     let b:{matchstr(s:type,'[^.]*')}_subtype = matchstr(s:type,'\.\zs.*')
   endif
   syn case match
-  exe 'syn include @markdownHighlight_'.tr(s:type,'.','_').' syntax/'.matchstr(s:type,'[^.]*').'.vim'
+  exe 'syn include @markdownHighlight_'.tr(s:type,'.','_').' syntax/'.matchstr(s:type,'[^.]*').'.mnv'
   unlet! b:current_syntax
   let s:done_include[matchstr(s:type,'[^.]*')] = 1
 endfor
@@ -139,7 +139,7 @@ unlet! s:type
 unlet! s:done_include
 
 if get(b:, 'markdown_yaml_head', get(g:, 'markdown_yaml_head', main_syntax ==# 'markdown'))
-  syn include @markdownYamlTop syntax/yaml.vim
+  syn include @markdownYamlTop syntax/yaml.mnv
   unlet! b:current_syntax
   syn region markdownYamlHead start="\%^---$" end="^\%(---\|\.\.\.\)\s*$" keepend contains=@markdownYamlTop,@Spell
 endif
@@ -197,4 +197,4 @@ if main_syntax ==# 'markdown'
   unlet main_syntax
 endif
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/masm.vim b/uvim/runtime/syntax/masm.mnv
index dc9a292cce..03a402e860 100644
--- a/uvim/runtime/syntax/masm.vim
+++ b/uvim/runtime/syntax/masm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Microsoft Macro Assembler (80x86)
 " Orig Author:	Rob Brady <robb@datatone.com>
 " Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,_,36,60,62,63,@-@
 
@@ -557,4 +557,4 @@ let b:current_syntax = "masm"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mason.vim b/uvim/runtime/syntax/mason.mnv
index cfc0278011..aa391c3bef 100644
--- a/uvim/runtime/syntax/mason.vim
+++ b/uvim/runtime/syntax/mason.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      Mason (Perl embedded in HTML)
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2021 Oct 10
 " Contributors:  Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "                Andrew Smith <andrewdsmith@yahoo.com>
@@ -25,16 +25,16 @@ endif
 
 " First pull in the HTML syntax.
 "
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster htmlPreproc add=@masonTop
 
 " Now pull in the Perl syntax.
 "
-syn include @perlTop syntax/perl.vim
+syn include @perlTop syntax/perl.mnv
 unlet b:current_syntax
-syn include @podTop syntax/pod.vim
+syn include @podTop syntax/pod.mnv
 
 " It's hard to reduce down to the correct sub-set of Perl to highlight in some
 " of these cases so I've taken the safe option of just using perlTop in all of
diff --git a/uvim/runtime/syntax/master.vim b/uvim/runtime/syntax/master.mnv
index f89c5b2f1c..dc42eaeed7 100644
--- a/uvim/runtime/syntax/master.vim
+++ b/uvim/runtime/syntax/master.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Focus Master File
 " Maintainer:	Rob Brady <robb@datatone.com>
 " Last Change:	$Date: 2004/06/13 15:54:03 $
-" URL: http://www.datatone.com/~robb/vim/syntax/master.vim
+" URL: http://www.datatone.com/~robb/mnv/syntax/master.mnv
 " $Revision: 1.1 $
 
 " this is a very simple syntax file - I will be improving it
@@ -34,4 +34,4 @@ hi def link masterString  String
 
 let b:current_syntax = "master"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/matlab.vim b/uvim/runtime/syntax/matlab.mnv
index 520280980a..287a1549a4 100644
--- a/uvim/runtime/syntax/matlab.vim
+++ b/uvim/runtime/syntax/matlab.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Matlab
-" Maintainer:	Alex Burka <vim@alexburka.com>
-" Credits:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+" Maintainer:	Alex Burka <mnv@alexburka.com>
+" Credits:	Preben 'Peppe' Guldberg <peppe-mnv@wielders.org>
 "		Maurizio Tranchero - maurizio(.)tranchero(@)gmail(.)com
 "		Original author: Mario Eusebio
 " Last Change:	June 10 2019
@@ -116,4 +116,4 @@ hi def link matlabLogicalOperator		matlabOperator
 
 let b:current_syntax = "matlab"
 
-"EOF	vim: ts=8 noet tw=100 sw=8 sts=0
+"EOF	mnv: ts=8 noet tw=100 sw=8 sts=0
diff --git a/uvim/runtime/syntax/maxima.vim b/uvim/runtime/syntax/maxima.mnv
index 46e1e4ff84..23c49fbe1a 100644
--- a/uvim/runtime/syntax/maxima.vim
+++ b/uvim/runtime/syntax/maxima.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Maxima (symbolic algebra program)
 " Maintainer:	Robert Dodier (robert.dodier@gmail.com)
 " Last Change:	April 6, 2006
 " Version:	1
-" Adapted mostly from xmath.vim
-" Number formats adapted from r.vim
+" Adapted mostly from xmath.mnv
+" Number formats adapted from r.mnv
 "
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/mbsync.vim b/uvim/runtime/syntax/mbsync.mnv
index daef41ddd3..fd6722124b 100644
--- a/uvim/runtime/syntax/mbsync.vim
+++ b/uvim/runtime/syntax/mbsync.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	mbsyncrc
 " Maintainer:	Pierrick Guillaume  <pguillaume@fymyte.com>
 " Last Change:	2025 Apr 13
-" 2025 Jun 04 by Vim project: match TLSType configuration variable
-" 2026 Jan 15 by Vim project: support TLSVersions keyword
+" 2025 Jun 04 by MNV project: match TLSType configuration variable
+" 2026 Jan 15 by MNV project: support TLSVersions keyword
 "
 " Syntax support for mbsync config file
 
@@ -17,7 +17,7 @@ endif
 let b:current_syntax = 'mbsync'
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match mbsError    '.*'
 
diff --git a/uvim/runtime/syntax/mediawiki.vim b/uvim/runtime/syntax/mediawiki.mnv
index 8ac30b93db..9972cabe7c 100644
--- a/uvim/runtime/syntax/mediawiki.vim
+++ b/uvim/runtime/syntax/mediawiki.mnv
@@ -1,9 +1,9 @@
-" mediawiki.vim (formerly named Wikipedia.vim)
+" mediawiki.mnv (formerly named Wikipedia.mnv)
 "
-" Vim syntax file
+" MNV syntax file
 " Language: MediaWiki
 " Maintainer: Avid Seeker <avidseeker7@protonmail.com>
-" Home: http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
+" Home: http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#MNV
 " Last Change: 2024 Jul 14
 " Credits: [[User:Unforgettableid]] [[User:Aepd87]], [[User:Danny373]], [[User:Ingo Karkat]], et al.
 "
@@ -125,7 +125,7 @@ sy region wikiNowiki start="<nowiki>"              end="<\/nowiki>"me=e-9 contai
 sy region wikiSource start="<source\s\+[^>]\+>"         keepend end="<\/source>"me=e-9 contains=wikiSourceTag
 sy region wikiSyntaxHL start="<syntaxhighlight\s\+[^>]\+>" keepend end="<\/syntaxhighlight>"me=e-18 contains=wikiSyntaxHLTag
 
-sy include @TeX syntax/tex.vim
+sy include @TeX syntax/tex.mnv
 unlet b:current_syntax
 sy region wikiTeX matchgroup=htmlTag start="<math>" end="<\/math>"  contains=@texMathZoneGroup,wikiNowiki,wikiNowikiEndTag
 sy region wikiRef matchgroup=htmlTag start="<ref>"  end="<\/ref>"   contains=wikiNowiki,wikiNowikiEndTag
diff --git a/uvim/runtime/syntax/mel.vim b/uvim/runtime/syntax/mel.mnv
index f0f1bcafd3..b7c683bea8 100644
--- a/uvim/runtime/syntax/mel.vim
+++ b/uvim/runtime/syntax/mel.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MEL (Maya Extension Language)
 " Maintainer:	Robert Minsk <egbert@centropolisfx.com>
 " Last Change:	May 27 1999
-" Based on:	Bram Moolenaar <Bram@vim.org> C syntax file
+" Based on:	Bram Moolenaar <Bram@mnv.org> C syntax file
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/mermaid.vim b/uvim/runtime/syntax/mermaid.mnv
index 5a9a217337..afc50e61f9 100644
--- a/uvim/runtime/syntax/mermaid.vim
+++ b/uvim/runtime/syntax/mermaid.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Mermaid
-" Maintainer:   Craig MacEahern <https://github.com/craigmac/vim-mermaid>
+" Maintainer:   Craig MacEahern <https://github.com/craigmac/mnv-mermaid>
 " Filenames:    *.mmd
 " Last Change:  2023 Dec 26
 
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax iskeyword @,48-57,192-255,$,_,-,:
 syntax keyword mermaidKeyword
@@ -128,4 +128,4 @@ let b:current_syntax = "mermaid"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/meson.vim b/uvim/runtime/syntax/meson.mnv
index 4eaf696322..c52a1bdab7 100644
--- a/uvim/runtime/syntax/meson.vim
+++ b/uvim/runtime/syntax/meson.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Meson
-" License:	VIM License
+" License:	MNV License
 " Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
 "		Liam Beguin <liambeguin@gmail.com>
 " Last Change:	2023 May 27
@@ -8,7 +8,7 @@
 "		Neil Schemenauer <nas@meson.ca>
 "		Dmitry Vasiliev
 "
-"		This version is copied and edited from python.vim
+"		This version is copied and edited from python.mnv
 "		It's very basic, and doesn't do many things I'd like it to
 "		For instance, it should show errors for syntax that is valid in
 "		Python but not in Meson.
@@ -25,7 +25,7 @@ endif
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " http://mesonbuild.com/Syntax.html
 syn keyword mesonConditional	elif else if endif
@@ -159,4 +159,4 @@ let b:current_syntax = "meson"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2 sts=2 ts=8 noet:
+" mnv:set sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/messages.vim b/uvim/runtime/syntax/messages.mnv
index 8b970aaa7f..37def93cc4 100644
--- a/uvim/runtime/syntax/messages.vim
+++ b/uvim/runtime/syntax/messages.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         /var/log/messages file
 " Maintainer:       Yakov Lerner <iler.ml@gmail.com>
 " Latest Revision:  2008-06-29
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   messagesBegin       display '^' nextgroup=messagesDate,messagesDateRFC3339
 
diff --git a/uvim/runtime/syntax/mf.vim b/uvim/runtime/syntax/mf.mnv
index d4acbed19b..0816bd1aa4 100644
--- a/uvim/runtime/syntax/mf.vim
+++ b/uvim/runtime/syntax/mf.mnv
@@ -1,6 +1,6 @@
-vim9script
+mnv9script
 
-# Vim syntax file
+# MNV syntax file
 # Language:           METAFONT
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
@@ -305,4 +305,4 @@ hi def link mfTodoComment  Todo
 
 b:current_syntax = "mf"
 
-# vim: sw=2 fdm=marker
+# mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/syntax/mgl.vim b/uvim/runtime/syntax/mgl.mnv
index f7bc617f5a..ef442e8623 100644
--- a/uvim/runtime/syntax/mgl.vim
+++ b/uvim/runtime/syntax/mgl.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MGL
 " Version: 1.0
 " Last Change:	2006 Feb 21
 " Maintainer:  Gero Kuhlmann <gero@gkminix.han.de>
 "
-" $Id: mgl.vim,v 1.1 2006/02/21 22:08:20 vimboss Exp $
+" $Id: mgl.mnv,v 1.1 2006/02/21 22:08:20 mnvboss Exp $
 "
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -114,4 +114,4 @@ hi def link mglType		Type
 
 let b:current_syntax = "mgl"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/mgp.vim b/uvim/runtime/syntax/mgp.mnv
index 7227804550..e0ebdfe802 100644
--- a/uvim/runtime/syntax/mgp.vim
+++ b/uvim/runtime/syntax/mgp.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     mgp - MaGic Point
 " Maintainer:   Gerfried Fuchs <alfie@ist.org>
 " Filenames:    *.mgp
 " Last Change:  25 Apr 2001
-" URL:		http://alfie.ist.org/vim/syntax/mgp.vim
+" URL:		http://alfie.ist.org/mnv/syntax/mgp.mnv
 "
 " Comments are very welcome - but please make sure that you are commenting on
 " the latest version of this file.
diff --git a/uvim/runtime/syntax/mib.vim b/uvim/runtime/syntax/mib.mnv
index 6062d50bcf..4d847969f1 100644
--- a/uvim/runtime/syntax/mib.vim
+++ b/uvim/runtime/syntax/mib.mnv
@@ -1,5 +1,5 @@
-" Vim syntax file
-" Language:        Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files
+" MNV syntax file
+" Language:        MNV syntax file for SNMPv1 and SNMPv2 MIB and SMI files
 " Maintainer:      Martin Smat <msmat@post.cz>
 " Original Author: David Pascoe <pascoedj@spamcop.net>
 " Written:     	   Wed Jan 28 14:37:23 GMT--8:00 1998
diff --git a/uvim/runtime/syntax/mix.vim b/uvim/runtime/syntax/mix.mnv
index 564d344cc8..3373dec6d0 100644
--- a/uvim/runtime/syntax/mix.vim
+++ b/uvim/runtime/syntax/mix.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MIX (Donald Knuth's assembly language used in TAOCP)
 " Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
 " Filenames:	*.mixal *.mix
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -81,4 +81,4 @@ let b:current_syntax = "mix"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mma.vim b/uvim/runtime/syntax/mma.mnv
index 802cbe5538..bc68651a55 100644
--- a/uvim/runtime/syntax/mma.vim
+++ b/uvim/runtime/syntax/mma.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Mathematica
 " Maintainer:   steve layland <layland@wolfram.com>
 " Last Change:  2012 Feb 03 by Thilo Six
 "               2024 May 24 by Riley Bruins <ribru17@gmail.com> (remove 'commentstring')
-" Source:       http://members.wri.com/layland/vim/syntax/mma.vim
-"               http://vim.sourceforge.net/scripts/script.php?script_id=1273
-" Id:           $Id: mma.vim,v 1.4 2006/04/14 20:40:38 vimboss Exp $
+" Source:       http://members.wri.com/layland/mnv/syntax/mma.mnv
+"               http://mnv.sourceforge.net/scripts/script.php?script_id=1273
+" Id:           $Id: mma.mnv,v 1.4 2006/04/14 20:40:38 mnvboss Exp $
 " NOTE:
 "
 " Empty .m files will automatically be presumed as Matlab files
-" unless you have the following in your .vimrc:
+" unless you have the following in your .mnvrc:
 "
 "       let filetype_m="mma"
 "
@@ -22,11 +22,11 @@
 " o  Original Mathematica syntax version written by
 "    Wolfgang Waltenberger <wwalten@ben.tuwien.ac.at>
 " o  Some ideas like the CommentStar,CommentTitle were adapted
-"    from the Java vim syntax file by Claudio Fleiner.  Thanks!
+"    from the Java mnv syntax file by Claudio Fleiner.  Thanks!
 " o  Everything else written by steve <layland@wolfram.com>
 "
 " Bugs:
-" o  Vim 6.1 didn't really have support for character classes
+" o  MNV 6.1 didn't really have support for character classes
 "    of other named character classes.  For example, [\a\d]
 "    didn't work.  Therefore, a lot of this code uses explicit
 "    character classes instead: [0-9a-zA-Z]
@@ -42,7 +42,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Group Definitions:
 syntax cluster mmaNotes contains=mmaTodo,mmaFixme
@@ -285,7 +285,7 @@ syntax sync fromstart
 
 " NOTE - the following links are not guaranteed to
 " look good under all colorschemes.  You might need to
-" :so $VIMRUNTIME/syntax/hitest.vim and tweak these to
+" :so $MNVRUNTIME/syntax/hitest.mnv and tweak these to
 " look good in yours
 
 
diff --git a/uvim/runtime/syntax/mmix.vim b/uvim/runtime/syntax/mmix.mnv
index 0590767f2d..0cb8e80c74 100644
--- a/uvim/runtime/syntax/mmix.vim
+++ b/uvim/runtime/syntax/mmix.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MMIX
 " Maintainer:	Dirk Hüsken, <huesken@informatik.uni-tuebingen.de>
 " Last Change:	2012 Jun 01
 " 		(Dominique Pelle added @Spell)
 " Filenames:	*.mms
-" URL: http://homepages.uni-tuebingen.de/student/dirk.huesken/vim/syntax/mmix.vim
+" URL: http://homepages.uni-tuebingen.de/student/dirk.huesken/mnv/syntax/mmix.mnv
 
 " Limitations:	Comments must start with either % or //
 "		(preferably %, Knuth-Style)
@@ -149,4 +149,4 @@ hi def link mmixSpecialComment Comment
 
 let b:current_syntax = "mmix"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mmp.vim b/uvim/runtime/syntax/mmp.mnv
index d0b9f7cfb5..d2e43b1bbc 100644
--- a/uvim/runtime/syntax/mmp.vim
+++ b/uvim/runtime/syntax/mmp.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Symbian meta-makefile definition (MMP)
 " Maintainer:	Ron Aaron <ron@ronware.org>
 " Last Change:	2007/11/07
-" URL: http://ronware.org/wiki/vim/mmp
+" URL: http://ronware.org/wiki/mnv/mmp
 " Filetypes:	*.mmp
 
 " quit when a syntax file was already loaded
@@ -46,4 +46,4 @@ endif
 
 let b:current_syntax = "mmp"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mnv.mnv b/uvim/runtime/syntax/mnv.mnv
new file mode 100644
index 0000000000..2ec7731814
--- /dev/null
+++ b/uvim/runtime/syntax/mnv.mnv
@@ -0,0 +1,2931 @@
+" MNV syntax file
+" Language:	   MNV script
+" Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
+"	   Doug Kearns <dougkearns@gmail.com>
+" Last Change:	   2026 Mar 13
+" Former Maintainer: Charles E. Campbell
+
+" DO NOT CHANGE DIRECTLY.
+" THIS FILE PARTLY GENERATED BY gen_syntax_mnv.mnv.
+" (Search string "GEN_SYN_MNV:" in this file)
+
+" Quit when a syntax file was already loaded {{{1
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&mnv
+
+" Feature testing {{{1
+
+" NOTE: mnvsyn_force_mnv9 for internal use only
+let s:mnv9script = get(b:, "mnvsyn_force_mnv9", v:false) || "\n" .. getline(1, 32)->join("\n") =~# '\n\s*mnv9\%[script]\>'
+
+function s:has(feature)
+  return has(a:feature) || index(get(g:, "mnvsyn_mnv_features", []), a:feature) != -1
+endfunction
+
+" Automatically generated keyword lists: {{{1
+
+" mnvTodo: contains common special-notices for comments {{{2
+" Use the mnvCommentGroup cluster to add your own.
+syn keyword mnvTodo contained	COMBAK	FIXME	TODO	XXX
+syn cluster mnvCommentGroup	contains=mnvTodo,@Spell
+
+" regular mnv commands {{{2
+" GEN_SYN_MNV: mnvCommand normal, START_STR='syn keyword mnvCommand contained', END_STR='nextgroup=mnvBang'
+syn keyword mnvCommand contained al[l] ar[gs] arga[dd] argd[elete] argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment] as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bf[irst] bl[ast] bm[odified] bn[ext] bp[revious] br[ewind] brea[k] buffers bun[load] bw[ipeout] cN[ext] cNf[ile] cabo[ve] cad[dbuffer] cadde[xpr] caddf[ile] caf[ter] cb[uffer] cbe[fore] cbel[ow] cbo[ttom] cc ccl[ose] ce[nter] cex[pr] cf[ile] cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] changes che[ckpath] checkt[ime] chi[story] cl[ist] clip[reset] cla[st] clo[se] cle[arjumps] cn[ext] cnew[er] cnf[ile] col[der] colo[rscheme] comc[lear] comp[iler] con[tinue] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] delm[arks] defc[ompile] di[splay] dif[fupdate] diffg[et] diffo[ff] nextgroup=mnvBang
+syn keyword mnvCommand contained diffp[atch] diffpu[t] diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op] ds[earch] dsp[lit] e[dit] ea[rlier] em[enu] endfo[r] endt[ry] endw[hile] ene[w] ex exi[t] exu[sage] f[ile] files fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldo[pen] g[lobal] go[to] gu[i] gv[im] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] ij[ump] il[ist] int[ro] ip[ut] is[earch] isp[lit] ju[mps] l[ist] lN[ext] lNf[ile] la[st] lab[ove] lad[dexpr] laddb[uffer] laddf[ile] laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lcl[ose] lcs[cope] le[ft] lex[pr] lf[ile] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] lockv[ar] lol[der] lop[en] lp[revious] nextgroup=mnvBang
+syn keyword mnvCommand contained lpf[ile] lr[ewind] lt[ag] lw[indow] ls m[ove] marks mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] n[ext] nb[key] nbc[lose] nbs[tart] noh[lsearch] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] ped[it] po[p] pp[op] pre[serve] prev[ious] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] redrawtabp[anel] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] ru[ntime] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] scr[iptnames] nextgroup=mnvBang
+syn keyword mnvCommand contained scripte[ncoding] scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sla[st] sn[ext] so[urce] spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sre[wind] st[op] sta[g] star[tinsert] startg[replace] startr[eplace] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sync[bind] smi[le] t tN[ext] ta[g] tags tabc[lose] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs te[aroff] tf[irst] tj[ump] tl[ast] tn[ext] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] up[date] v[global] ve[rsion] vi[sual] vie[w] viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wi[nsize] nextgroup=mnvBang
+syn keyword mnvCommand contained winp[os] wl[restore] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp deletep a i nextgroup=mnvBang
+
+" Lower priority :syn-match to allow for :command/function() distinction
+" :chdir is handled specially elsewhere
+syn match mnvCommand "\<co\%[py]\>"     nextgroup=mnvBang
+syn match mnvCommand "\<d\%[elete]\>"   nextgroup=mnvBang
+syn match mnvCommand "\<j\%[oin]\>"     nextgroup=mnvBang
+syn match mnvCommand "\<sp\%[lit]\>"    nextgroup=mnvBang
+syn match mnvCommand "\<sw\%[apname]\>" nextgroup=mnvBang
+
+" GEN_SYN_MNV: mnvCommand modifier, START_STR='syn keyword mnvCommandModifier', END_STR='skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList'
+syn keyword mnvCommandModifier abo[veleft] bel[owright] bo[tright] hid[e] hor[izontal] kee[pmarks] keepj[umps] keepp[atterns] keepa[lt] lefta[bove] leg[acy] loc[kmarks] noa[utocmd] nos[wapfile] rightb[elow] san[dbox] sil[ent] tab to[pleft] uns[ilent] verb[ose] vert[ical] mnv9[cmd] skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList
+" :filter is handled specially elsewhere
+syn match	mnvCommandModifierBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvCmdList
+
+" Lower priority :syn-match to allow for :command/function() distinction
+syn match mnvCommand "\<bro\%[wse]\>"  skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList
+syn match mnvCommand "\<conf\%[irm]\>" skipwhite nextgroup=mnvCommandModifierBang,@mnvCmdList
+
+" Lower priority for _new_ to distinguish constructors from the command.
+syn match   mnvCommand contained	"\<new\>(\@!"
+syn match   mnvCommand contained	"\<z[-+^.=]\=\>"
+syn keyword mnvStdPlugin contained	Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man Over Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Until Winbar XMLent XMLns
+
+" mnvOptions are caught only when contained in a mnvSet {{{2
+" GEN_SYN_MNV: mnvOption normal, START_STR='syn keyword mnvOption contained', END_STR='skipwhite nextgroup=mnvSetEqual,mnvSetMod'
+syn keyword mnvOption contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete acl autocompletedelay act autocompletetimeout ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained co columns com comments cms commentstring cp compatible cpt complete cfu completefunc cia completeitemalign cot completeopt cpp completepopup csl completeslash cto completetimeout cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained efm errorformat ek esckeys ei eventignore eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained mmd maxmapdepth mm maxmem mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc ost osctimeoutlen pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline stlo statuslineopt su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors trz termresize skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained tsy termsync twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi mnvinfo vif mnvinfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor skipwhite nextgroup=mnvSetEqual,mnvSetMod
+syn keyword mnvOption contained wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes skipwhite nextgroup=mnvSetEqual,mnvSetMod
+
+" mnvOptions: These are the turn-off setting variants {{{2
+" GEN_SYN_MNV: mnvOption turn-off, START_STR='syn keyword mnvOption contained', END_STR=''
+syn keyword mnvOption contained noari noallowrevins noarab noarabic noarshape noarabicshape noacd noautochdir noac noautocomplete noai noautoindent noar noautoread noasd noautoshelldir noaw noautowrite noawa noautowriteall nobk nobackup nobeval noballooneval nobevalterm noballoonevalterm nobin nobinary nobomb nobri nobreakindent nobl nobuflisted nocdh nocdhome nocin nocindent nocp nocompatible nocf noconfirm noci nocopyindent nocsre nocscoperelative nocst nocscopetag nocsverb nocscopeverbose nocrb nocursorbind nocuc nocursorcolumn nocul nocursorline nodeco nodelcombine nodiff nodg nodigraph noed noedcompatible noemo noemoji noeof noendoffile noeol noendofline noea noequalalways noeb noerrorbells noek noesckeys noet noexpandtab noex noexrc nofic nofileignorecase
+syn keyword mnvOption contained nofixeol nofixendofline nofen nofoldenable nofs nofsync nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkp nohkmapp nohls nohlsearch noicon noic noignorecase noimc noimcmdline noimd noimdisable nois noincsearch noinf noinfercase noim noinsertmode nojs nojoinspaces nolnr nolangnoremap nolrm nolangremap nolz nolazyredraw nolbr nolinebreak nolisp nolist nolpl noloadplugins nomagic noml nomodeline nomle nomodelineexpr noma nomodifiable nomod nomodified nomore nomousef nomousefocus nomh nomousehide nomousemev nomousemoveevent nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopvw nopreviewwindow noprompt noro noreadonly nornu norelativenumber noremap nors norestorescreen nori norevins norl norightleft noru noruler
+syn keyword mnvOption contained noscb noscrollbind noscf noscrollfocus nosecure nossl noshellslash nostmp noshelltemp nosr noshiftround nosn noshortname nosc noshowcmd nosft noshowfulltag nosm noshowmatch nosmd noshowmode noscs nosmartcase nosi nosmartindent nosta nosmarttab nosms nosmoothscroll nospell nosb nosplitbelow nospr nosplitright nosol nostartofline noswf noswapfile notbs notagbsearch notr notagrelative notgst notagstack notbidi notermbidi notgc notermguicolors notsy notermsync noterse nota notextauto notx notextmode notop notildeop noto notimeout notitle nottimeout notbi nottybuiltin notf nottyfast noudf noundofile novb novisualbell nowarn nowiv noweirdinvert nowic nowildignorecase nowmnu nowildmenu nowfb nowinfixbuf nowfh nowinfixheight nowfw nowinfixwidth
+syn keyword mnvOption contained nowst nowlsteal nowrap nows nowrapscan nowrite nowa nowriteany nowb nowritebackup noxtermcodes
+
+" mnvOptions: These are the invertible variants {{{2
+" GEN_SYN_MNV: mnvOption invertible, START_STR='syn keyword mnvOption contained', END_STR=''
+syn keyword mnvOption contained invari invallowrevins invarab invarabic invarshape invarabicshape invacd invautochdir invac invautocomplete invai invautoindent invar invautoread invasd invautoshelldir invaw invautowrite invawa invautowriteall invbk invbackup invbeval invballooneval invbevalterm invballoonevalterm invbin invbinary invbomb invbri invbreakindent invbl invbuflisted invcdh invcdhome invcin invcindent invcp invcompatible invcf invconfirm invci invcopyindent invcsre invcscoperelative invcst invcscopetag invcsverb invcscopeverbose invcrb invcursorbind invcuc invcursorcolumn invcul invcursorline invdeco invdelcombine invdiff invdg invdigraph inved invedcompatible invemo invemoji inveof invendoffile inveol invendofline invea invequalalways inveb inverrorbells
+syn keyword mnvOption contained invek invesckeys invet invexpandtab invex invexrc invfic invfileignorecase invfixeol invfixendofline invfen invfoldenable invfs invfsync invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkp invhkmapp invhls invhlsearch invicon invic invignorecase inmnvc inmnvcmdline inmnvd inmnvdisable invis invincsearch invinf invinfercase inmnv invinsertmode invjs invjoinspaces invlnr invlangnoremap invlrm invlangremap invlz invlazyredraw invlbr invlinebreak invlisp invlist invlpl invloadplugins invmagic invml invmodeline invmle invmodelineexpr invma invmodifiable invmod invmodified invmore invmousef invmousefocus invmh invmousehide invmousemev invmousemoveevent invnu invnumber invodev invopendevice invpaste invpi invpreserveindent
+syn keyword mnvOption contained invpvw invpreviewwindow invprompt invro invreadonly invrnu invrelativenumber invremap invrs invrestorescreen invri invrevins invrl invrightleft invru invruler invscb invscrollbind invscf invscrollfocus invsecure invssl invshellslash invstmp invshelltemp invsr invshiftround invsn invshortname invsc invshowcmd invsft invshowfulltag invsm invshowmatch invsmd invshowmode invscs invsmartcase invsi invsmartindent invsta invsmarttab invsms invsmoothscroll invspell invsb invsplitbelow invspr invsplitright invsol invstartofline invswf invswapfile invtbs invtagbsearch invtr invtagrelative invtgst invtagstack invtbidi invtermbidi invtgc invtermguicolors invtsy invtermsync invterse invta invtextauto invtx invtextmode invtop invtildeop invto invtimeout
+syn keyword mnvOption contained invtitle invttimeout invtbi invttybuiltin invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwst invwlsteal invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes
+" termcap codes (which can also be set) {{{2
+" GEN_SYN_MNV: mnvOption term output code, START_STR='syn keyword mnvOption contained', END_STR='skipwhite nextgroup=mnvSetEqual,mnvSetMod'
+syn keyword mnvOption contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo t_BS t_ES skipwhite nextgroup=mnvSetEqual,mnvSetMod
+" term key codes
+syn keyword mnvOption contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
+syn match   mnvOption contained	"t_%1"
+syn match   mnvOption contained	"t_#2"
+syn match   mnvOption contained	"t_#4"
+syn match   mnvOption contained	"t_@7"
+syn match   mnvOption contained	"t_*7"
+syn match   mnvOption contained	"t_&8"
+syn match   mnvOption contained	"t_%i"
+syn match   mnvOption contained	"t_k;"
+
+" mnvOptions: These are the variable names {{{2
+" GEN_SYN_MNV: mnvOption normal variable,           START_STR='syn keyword mnvOptionVarName contained', END_STR=''
+syn keyword mnvOptionVarName contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete acl autocompletedelay act autocompletetimeout ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn
+syn keyword mnvOptionVarName contained co columns com comments cms commentstring cp compatible cpt complete cfu completefunc cia completeitemalign cot completeopt cpp completepopup csl completeslash cto completetimeout cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile
+syn keyword mnvOptionVarName contained efm errorformat ek esckeys ei eventignore eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight
+syn keyword mnvOptionVarName contained hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine
+syn keyword mnvOptionVarName contained mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc ost osctimeoutlen pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset
+syn keyword mnvOptionVarName contained pmbfn printmbfont popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess
+syn keyword mnvOptionVarName contained sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline stlo statuslineopt su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding
+syn keyword mnvOptionVarName contained tgc termguicolors trz termresize tsy termsync twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi mnvinfo vif mnvinfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode
+syn keyword mnvOptionVarName contained wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes
+" GEN_SYN_MNV: mnvOption term output code variable, START_STR='syn keyword mnvOptionVarName contained', END_STR=''
+syn keyword mnvOptionVarName contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo t_BS t_ES
+syn keyword mnvOptionVarName contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
+syn match   mnvOptionVarName contained	"t_%1"
+syn match   mnvOptionVarName contained	"t_#2"
+syn match   mnvOptionVarName contained	"t_#4"
+syn match   mnvOptionVarName contained	"t_@7"
+syn match   mnvOptionVarName contained	"t_*7"
+syn match   mnvOptionVarName contained	"t_&8"
+syn match   mnvOptionVarName contained	"t_%i"
+syn match   mnvOptionVarName contained	"t_k;"
+
+" unsupported settings: some were supported by vi but don't do anything in mnv {{{2
+" GEN_SYN_MNV: Missing mnvOption, START_STR='syn keyword mnvErrSetting contained', END_STR=''
+syn keyword mnvErrSetting contained akm altkeymap anti antialias ap autoprint bf beautify biosk bioskey consk conskey fk fkmap fl flash gr graphic ht hardtabs macatsui mesg novice open opt optimize oft osfiletype redraw slow slowopen sourceany w1200 w300 w9600
+syn keyword mnvErrSetting contained noakm noaltkeymap noanti noantialias noap noautoprint nobf nobeautify nobiosk nobioskey noconsk noconskey nofk nofkmap nofl noflash nogr nographic nomacatsui nomesg nonovice noopen noopt nooptimize noredraw noslow noslowopen nosourceany
+syn keyword mnvErrSetting contained invakm invaltkeymap invanti invantialias invap invautoprint invbf invbeautify invbiosk invbioskey invconsk invconskey invfk invfkmap invfl invflash invgr invgraphic invmacatsui invmesg invnovice invopen invopt invoptimize invredraw invslow invslowopen invsourceany
+
+" AutoCmd Events {{{2
+syn case ignore
+" GEN_SYN_MNV: mnvAutoEvent, START_STR='syn keyword mnvAutoEvent contained', END_STR='skipwhite nextgroup=mnvAutoEventSep,@mnvAutocmdPattern'
+syn keyword mnvAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdlineLeavePre CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedC CursorMovedI DiffUpdated DirChanged DirChangedPre EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre skipwhite nextgroup=mnvAutoEventSep,@mnvAutocmdPattern
+syn keyword mnvAutoEvent contained FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave InsertLeavePre KeyInputPre MenuPopup ModeChanged OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost SessionLoadPre SessionWritePost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabClosedPre TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TermResponseAll TextChanged TextChangedI TextChangedP TextChangedT TextYankPost MNVEnter MNVLeave MNVLeavePre MNVResized MNVResume MNVSuspend WinClosed WinEnter WinLeave WinNew WinNewPre skipwhite nextgroup=mnvAutoEventSep,@mnvAutocmdPattern
+syn keyword mnvAutoEvent contained WinResized WinScrolled skipwhite nextgroup=mnvAutoEventSep,@mnvAutocmdPattern
+
+syn keyword	mnvAutoEvent	contained	User	skipwhite nextgroup=mnvUserAutoEvent
+syn match	mnvUserAutoEvent	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvUserAutoEventSep,mnvAutocmdMod,mnvAutocmdBlock
+
+" Highlight commonly used Groupnames {{{2
+" GEN_SYN_MNV: mnvGroup, START_STR='syn keyword mnvGroup contained', END_STR=''
+syn keyword mnvGroup contained Added Bold BoldItalic Boolean Changed Character Comment Conditional Constant Debug Define Delimiter Error Exception Float Function Identifier Ignore Include Italic Keyword Label Macro Number Operator PreCondit PreProc Removed Repeat Special SpecialChar SpecialComment Statement StorageClass String Structure Tag Todo Type Typedef Underlined
+
+" Default highlighting groups {{{2
+" GEN_SYN_MNV: mnvHLGroup, START_STR='syn keyword mnvHLGroup contained', END_STR=''
+syn keyword mnvHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit VisualNOS DiffText DiffTextAdd PmenuSbar TabLineSel TabLineFill TabPanel TabPanelSel TabPanelFill Cursor lCursor TitleBar TitleBarNC QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel PmenuBorder PopupSelected MessageWindow PopupNotification PreInsert Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb PmenuShadow Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen StatusLineTerm StatusLineTermNC ToolbarLine
+syn keyword mnvHLGroup contained ToolbarButton TitleBar TitleBarNC Menu Tooltip Scrollbar CursorIM ComplMatchIns LineNrAbove LineNrBelow MsgArea Terminal User1 User2 User3 User4 User5 User6 User7 User8 User9
+syn match mnvHLGroup contained "\<Conceal\>"
+syn case match
+
+" Function Names {{{2
+" GEN_SYN_MNV: mnvFuncName, START_STR='syn keyword mnvFuncName contained', END_STR=''
+syn keyword mnvFuncName contained abs acos add and append appendbufline argc argidx arglistid argv asin assert_beeps assert_equal assert_equalfile assert_exception assert_fails assert_false assert_inrange assert_match assert_nobeep assert_notequal assert_notmatch assert_report assert_true atan atan2 autocmd_add autocmd_delete autocmd_get balloon_gettext balloon_show balloon_split base64_decode base64_encode bindtextdomain blob2list blob2str browse browsedir bufadd bufexists buflisted bufload bufloaded bufname bufnr bufwinid bufwinnr byte2line byteidx byteidxcomp call ceil ch_canread ch_close ch_close_in ch_evalexpr ch_evalraw ch_getbufnr ch_getjob ch_info ch_listen ch_log ch_logfile ch_open ch_read ch_readblob ch_readraw ch_sendexpr ch_sendraw ch_setoptions ch_status
+syn keyword mnvFuncName contained changenr char2nr charclass charcol charidx chdir cindent clearmatches cmdcomplete_info col complete complete_add complete_check complete_info confirm copy cos cosh count cscope_connection cursor debugbreak deepcopy delete deletebufline did_filetype diff diff_filler diff_hlID digraph_get digraph_getlist digraph_set digraph_setlist echoraw empty environ err_teapot escape eval eventhandler executable execute exepath exists exists_compiled exp expand expandcmd extend extendnew feedkeys filecopy filereadable filewritable filter finddir findfile flatten flattennew float2nr floor fmod fnameescape fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreach foreground fullcommand funcref function garbagecollect get getbufinfo
+syn keyword mnvFuncName contained getbufline getbufoneline getbufvar getcellpixels getcellwidths getchangelist getchar getcharmod getcharpos getcharsearch getcharstr getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt getcmdscreenpos getcmdtype getcmdwintype getcompletion getcompletiontype getcurpos getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos getregtype getscriptinfo getstacktrace gettabinfo gettabvar gettabwinvar gettagstack gettext getwininfo getwinpos getwinposx getwinposy getwinvar glob glob2regpat globpath has has_key haslocaldir hasmapto histadd histdel
+syn keyword mnvFuncName contained histget histnr hlID hlexists hlget hlset hostname iconv id indent index indexof input inputdialog inputlist inputrestore inputsave inputsecret insert instanceof interrupt invert isabsolutepath isdirectory isinf islocked isnan items job_getchannel job_info job_setoptions job_start job_status job_stop join js_decode js_encode json_decode json_encode keys keytrans len libcall libcallnr line line2byte lispindent list2blob list2str list2tuple listener_add listener_flush listener_remove localtime log log10 luaeval map maparg mapcheck maplist mapnew mapset match matchadd matchaddpos matcharg matchbufline matchdelete matchend matchfuzzy matchfuzzypos matchlist matchstr matchstrlist matchstrpos max menu_info min mkdir mode mzeval nextnonblank
+syn keyword mnvFuncName contained ngettext nr2char or pathshorten perleval popup_atcursor popup_beval popup_clear popup_close popup_create popup_dialog popup_filter_menu popup_filter_yesno popup_findecho popup_findinfo popup_findpreview popup_getoptions popup_getpos popup_hide popup_list popup_locate popup_menu popup_move popup_notification popup_setbuf popup_setoptions popup_settext popup_show pow preinserted prevnonblank printf prompt_getprompt prompt_setcallback prompt_setinterrupt prompt_setprompt prop_add prop_add_list prop_clear prop_find prop_list prop_remove prop_type_add prop_type_change prop_type_delete prop_type_get prop_type_list pum_getpos pumvisible py3eval pyeval pyxeval rand range readblob readdir readdirex readfile redraw_listener_add redraw_listener_remove
+syn keyword mnvFuncName contained reduce reg_executing reg_recording reltime reltimefloat reltimestr remote_expr remote_foreground remote_peek remote_read remote_send remote_startserver remove rename repeat resolve reverse round rubyeval screenattr screenchar screenchars screencol screenpos screenrow screenstring search searchcount searchdecl searchpair searchpairpos searchpos server2client serverlist setbufline setbufvar setcellwidths setcharpos setcharsearch setcmdline setcmdpos setcursorcharpos setenv setfperm setline setloclist setmatches setpos setqflist setreg settabvar settabwinvar settagstack setwinvar sha256 shellescape shiftwidth sign_define sign_getdefined sign_getplaced sign_jump sign_place sign_placelist sign_undefine sign_unplace sign_unplacelist
+syn keyword mnvFuncName contained simplify sin sinh slice sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus term_gettitle term_gettty term_list term_scrape
+syn keyword mnvFuncName contained term_sendkeys term_setansicolors term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq uri_decode uri_encode utf16idx values virtcol virtcol2col
+syn keyword mnvFuncName contained visualmode wildmenumode wildtrigger win_execute win_findbuf win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
+
+" Predefined variable names {{{2
+" GEN_SYN_MNV: mnvVarName, START_STR='syn keyword mnvMNVVarName contained', END_STR=''
+syn keyword mnvMNVVarName contained count count1 prevcount errmsg warningmsg statusmsg shell_error this_session version lnum termresponse fname lang lc_time ctype charconvert_from charconvert_to fname_in fname_out fname_new fname_diff cmdarg foldstart foldend folddashes foldlevel progname servername dying exception throwpoint register cmdbang insertmode val key profiling fcs_reason fcs_choice beval_bufnr beval_winnr beval_winid beval_lnum beval_col beval_text scrollstart swapname swapchoice swapcommand char mouse_win mouse_winid mouse_lnum mouse_col operator searchforward hlsearch oldfiles windowid progpath completed_item option_new option_old option_oldlocal option_oldglobal option_command option_type errors false true none null numbermax numbermin numbersize
+syn keyword mnvMNVVarName contained mnv_did_enter testing t_number t_string t_func t_list t_dict t_float t_bool t_none t_job t_channel t_blob t_class t_object termrfgresp termrbgresp termu7resp termstyleresp termblinkresp event versionlong echospace argv collate exiting colornames sizeofint sizeoflong sizeofpointer maxcol python3_version t_typealias t_enum t_enumvalue stacktrace t_tuple wayland_display clipmethod termda1 termosc mnv_did_init clipproviders
+
+"--- syntax here and above generated by runtime/syntax/generator/gen_syntax_mnv.mnv ---
+
+" Special MNV Highlighting (not automatic) {{{1
+
+" Neomnv keyword list additions {{{2
+
+if s:has("nmnv")
+  syn keyword mnvOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
+  syn keyword mnvFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
+  syn match   mnvFuncName      contained "\<nmnv_\w\+\>"
+  syn keyword mnvMNVVarName    contained lua msgpack_types relnum stderr termrequest virtnum
+endif
+
+" Set up commands for this syntax highlighting file {{{2
+
+com! -nargs=* MNV9 execute <q-args> s:mnv9script ? "" : "contained"
+com! -nargs=* MNVL execute <q-args> s:mnv9script ? "contained" : ""
+
+if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# '[acefhiHlmpPrt]'
+ if g:mnvsyn_folding =~# 'a'
+  com! -nargs=* MNVFolda <args> fold
+ else
+  com! -nargs=* MNVFolda <args>
+ endif
+ if g:mnvsyn_folding =~# 'c'
+  com! -nargs=* MNVFoldc <args> fold
+ else
+  com! -nargs=* MNVFoldc <args>
+ endif
+ if g:mnvsyn_folding =~# 'e'
+  com! -nargs=* MNVFolde <args> fold
+ else
+  com! -nargs=* MNVFolde <args>
+ endif
+ if g:mnvsyn_folding =~# 'f'
+  com! -nargs=* MNVFoldf <args> fold
+ else
+  com! -nargs=* MNVFoldf <args>
+ endif
+ if g:mnvsyn_folding =~# 'h'
+  com! -nargs=* MNVFoldh <args> fold
+ else
+  com! -nargs=* MNVFoldh <args>
+ endif
+ if g:mnvsyn_folding =~# 'H'
+  com! -nargs=* MNVFoldH <args> fold
+ else
+  com! -nargs=* MNVFoldH <args>
+ endif
+ if g:mnvsyn_folding =~# 'i'
+  com! -nargs=* MNVFoldi <args> fold
+ else
+  com! -nargs=* MNVFoldi <args>
+ endif
+ if g:mnvsyn_folding =~# 'l'
+  com! -nargs=* MNVFoldl <args> fold
+ else
+  com! -nargs=* MNVFoldl <args>
+ endif
+ if g:mnvsyn_folding =~# 'm'
+  com! -nargs=* MNVFoldm <args> fold
+ else
+  com! -nargs=* MNVFoldm <args>
+ endif
+ if g:mnvsyn_folding =~# 'p'
+  com! -nargs=* MNVFoldp <args> fold
+ else
+  com! -nargs=* MNVFoldp <args>
+ endif
+ if g:mnvsyn_folding =~# 'P'
+  com! -nargs=* MNVFoldP <args> fold
+ else
+  com! -nargs=* MNVFoldP <args>
+ endif
+ if g:mnvsyn_folding =~# 'r'
+  com! -nargs=* MNVFoldr <args> fold
+ else
+  com! -nargs=* MNVFoldr <args>
+ endif
+ if g:mnvsyn_folding =~# 't'
+  com! -nargs=* MNVFoldt <args> fold
+ else
+  com! -nargs=* MNVFoldt <args>
+ endif
+else
+ com! -nargs=*	MNVFolda	<args>
+ com! -nargs=*	MNVFoldc	<args>
+ com! -nargs=*	MNVFolde	<args>
+ com! -nargs=*	MNVFoldf	<args>
+ com! -nargs=*	MNVFoldi	<args>
+ com! -nargs=*	MNVFoldh	<args>
+ com! -nargs=*	MNVFoldH	<args>
+ com! -nargs=*	MNVFoldl	<args>
+ com! -nargs=*	MNVFoldm	<args>
+ com! -nargs=*	MNVFoldp	<args>
+ com! -nargs=*	MNVFoldP	<args>
+ com! -nargs=*	MNVFoldr	<args>
+ com! -nargs=*	MNVFoldt	<args>
+endif
+
+" Deprecated variable options {{{2
+if exists("g:mnv_minlines")
+ let g:mnvsyn_minlines= g:mnv_minlines
+endif
+if exists("g:mnv_maxlines")
+ let g:mnvsyn_maxlines= g:mnv_maxlines
+endif
+if exists("g:mnvsyntax_noerror")
+ let g:mnvsyn_noerror= g:mnvsyntax_noerror
+endif
+
+" Nulls {{{2
+" =====
+MNV9 syn keyword  mnv9Null	null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string null_tuple
+
+" Booleans {{{2
+" ========
+MNV9 syn keyword mnv9Boolean	true false
+
+" Numbers {{{2
+" =======
+syn case ignore
+syn match	mnvNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript,mnvGlobal,mnvSubst1
+syn match	mnvNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@mnvComment
+syn match	mnvNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@mnvComment,mnvSubscript
+syn match	mnvNumber	'\<0z\>'			skipwhite nextgroup=@mnvComment
+syn match	mnvNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@mnvComment,mnvSubscript
+syn case match
+
+" All mnvCommands are contained by mnvIsCommand. {{{2
+syn cluster mnvCmdList	contains=mnvAbb,mnvAddress,mnvAt,mnvAutocmd,mnvAugroup,mnvBehave,mnvBreakadd,mnvBreakdel,mnvBreaklist,mnvCall,mnvCatch,mnvCd,mnvCommandModifier,mnvConst,mnvDoautocmd,mnvDebug,mnvDebuggreedy,mnvDef,mnvDefFold,mnvDefer,mnvDelcommand,mnvDelFunction,mnvDoCommand,@mnvEcho,mnvElse,mnvEnddef,mnvEndfunction,mnvEndif,mnvEval,mnvExecute,mnvIsCommand,mnvExtCmd,mnvExFilter,mnvExMark,mnvFiletype,mnvFor,mnvFunction,mnvFunctionFold,mnvGrep,mnvGrepAdd,mnvGlobal,mnvHelp,mnvHelpgrep,mnvHighlight,mnvHistory,mnvImport,mnvLanguage,mnvLet,mnvLoadkeymap,mnvLockvar,mnvMake,mnvMap,mnvMark,mnvMatch,mnvNotFunc,mnvNormal,mnvProfdel,mnvProfile,mnvPrompt,mnvRedir,mnvSet,mnvSleep,mnvSort,mnvSyntax,mnvSyntime,mnvSynColor,mnvSynLink,mnvTerminal,mnvThrow,mnvUniq,mnvUnlet,mnvUnlockvar,mnvUnmap,mnvUserCmd,mnvMNVgrep,mnvMNVgrepadd,mnvWincmd,mnvMenu,mnvMenutranslate,@mnv9CmdList,@mnvExUserCmdList,mnvLua,mnvMzScheme,mnvPerl,mnvPython,mnvPython3,mnvPythonX,mnvRuby,mnvTcl
+syn cluster mnv9CmdList	contains=mnv9Abstract,mnv9Class,mnv9Const,mnv9Enum,mnv9Export,mnv9Final,mnv9For,mnv9Interface,mnv9Type,mnv9Var
+syn match mnvCmdSep	"\\\@1<!|"	skipwhite nextgroup=@mnvCmdList,mnvSubst1,@mnvFunc
+syn match mnvCmdSep	":\+"	skipwhite nextgroup=@mnvCmdList,mnvSubst1
+syn match mnvCount	contained	"\d\+"
+syn match mnvIsCommand	"\<\h\w*\>"	nextgroup=mnvBang contains=mnvCommand
+syn match mnvBang	      contained	"!"
+syn match mnvWhitespace contained	"\s\+"
+
+syn region mnvSubscript contained	matchgroup=mnvSubscriptBracket start="\[" end="]" nextgroup=mnvSubscript contains=@mnvExprList
+
+syn match mnvVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnv9Super,mnv9This
+syn match mnvVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnvVarScope
+syn match mnvVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=mnvSubscript contains=mnvVarScope
+syn match mnvFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=mnvSubscript contains=mnvVarScope
+
+" match the scope prefix independently of the retrofitted scope dictionary
+syn match mnvVarScope   contained	"\<[bwglstav]:"
+syn match mnvMNVVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=mnvSubscript
+
+syn match mnvVarNameError contained "\<\h\w*\>"
+syn match mnvMNVVar	"\<v:"		nextgroup=mnvSubscript,mnvMNVVarName,mnvVarNameError
+syn match mnvOptionVar	"&\%([lg]:\)\="		nextgroup=mnvSubscript,mnvOptionVarName,mnvVarNameError
+syn cluster mnvSpecialVar	contains=mnvEnvvar,mnvLetRegister,mnvOptionVar,mnvMNVVar
+
+MNV9 syn match	mnvVar	contained	 "\<\h\w*\ze<"		nextgroup=mnv9TypeArgs
+
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
+MNV9 syn match	mnv9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=mnvLetHeredoc	contains=mnvVarScope
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=mnvSubscript
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=mnvOper	contains=mnv9Super,mnv9This
+MNV9 syn match	mnv9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=mnv9Super,mnv9This
+
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=mnvVar,@mnvSpecialVar
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+=<<"	skipwhite nextgroup=mnvLetHeredoc	contains=mnvVar,@mnvSpecialVar
+MNV9 syn match mnv9LhsVariableList	"\[\_[^]]\+]\ze\s\+\.\.="			contains=mnvVar,@mnvSpecialVar
+
+MNV9 syn match mnv9LhsRegister	"@["0-9\-a-zA-Z#=*+_/]\ze\s\+\%(\.\.\)\=="
+
+syn cluster mnvExprList	contains=@mnvSpecialVar,@mnvFunc,mnvNumber,mnvOper,mnvOperParen,mnvLambda,mnvString,mnvVar,@mnv9ExprList
+syn cluster mnv9ExprList	contains=mnv9Boolean,mnv9LambdaParams,mnv9Null
+
+" Insertions And Appends: insert append {{{2
+"   (buftype != nofile test avoids having append, change, insert show up in the command window)
+" =======================
+if &buftype != 'nofile'
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=mnvCommand end="^\.$" extend
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=mnvCommand end="^\.$" extend
+ syn region mnvInsert	matchgroup=mnvCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=mnvCommand end="^\.$" extend
+endif
+
+" Behave! {{{2
+" =======
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nobehaveerror")
+ syn match   mnvBehaveError contained	"[^ ]\+"
+endif
+syn match   mnvBehave	"\<be\%[have]\>"	nextgroup=mnvBehaveBang,mnvBehaveModel,mnvBehaveError skipwhite
+syn match   mnvBehaveBang	contained	"\a\@1<=!" nextgroup=mnvBehaveModel skipwhite
+syn keyword mnvBehaveModel	contained	mswin	xterm
+
+" Break* commands {{{2
+" ===============
+syn keyword	mnvBreakaddFunc	contained	func	skipwhite nextgroup=mnvBreakpointFunctionLine,mnvBreakpointFunction
+syn keyword	mnvBreakaddFile	contained	file	skipwhite nextgroup=mnvBreakpointFileLine,mnvBreakpointFilename
+syn keyword	mnvBreakaddHere	contained	here	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn keyword	mnvBreakaddExpr	contained	expr	skipwhite nextgroup=@mnvExprList
+
+syn match	mnvBreakpointGlob		contained	"*"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointNumber	contained	"\<\d\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+
+syn cluster mnvBreakpointArg contains=mnvBreakaddFunc,mnvBreakaddFile,mnvBreakaddHere,mnvBreakaddExpr
+
+syn match	mnvBreakpointFunction	contained	"\<\%(\*\|\w\)\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointFilename	contained	"\<\%(\*\|\f\)\+\>"	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+syn match	mnvBreakpointFunctionLine	contained	"\<\d\+\>"		skipwhite nextgroup=mnvBreakpointFunction
+syn match	mnvBreakpointFileLine	contained	"\<\d\+\>"		skipwhite nextgroup=mnvBreakpointFilename
+
+syn keyword	mnvBreakadd	breaka[dd]	skipwhite nextgroup=@mnvBreakpointArg
+syn keyword	mnvBreakdel	breakd[el]	skipwhite nextgroup=@mnvBreakpointArg,mnvBreakpointNumber,mnvBreakpointGlob
+syn keyword	mnvBreaklist	breakl[ist]	skipwhite nextgroup=mnvComment,mnv9Comment,mnvSep
+
+" Call {{{2
+" ====
+syn match mnvCall	"\<call\=\>"	skipwhite nextgroup=mnvVar,@mnvFunc
+
+" Cd: {{{2
+" ==
+" GEN_SYN_MNV: mnvCommand cd, START_STR='syn keyword mnvCd', END_STR='skipwhite nextgroup=mnvCdBang,mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep'
+syn keyword mnvCd cd lc[d] lch[dir] tc[d] tch[dir] skipwhite nextgroup=mnvCdBang,mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep
+syn match	mnvCd	"\<chd\%[ir]\>"	skipwhite nextgroup=mnvCdBang,mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep
+syn region	mnvCdArg	contained
+      \ start=+["#|]\@!\S+
+      \ end="\ze\s*$"
+      \ end=+\ze\s*\\\@1<!["#|]+
+      \ skipwhite nextgroup=mnvComment,mnv9Comment,mnvCmdSep
+      \ contains=mnvSpecfile,@mnvWildCard
+      \ oneline
+
+syn match	mnvCdBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvCdArg,mnvComment,mnv9Comment,mnvCmdSep
+
+" Debug {{{2
+" =====
+syn keyword	mnvDebug	deb[ug]	skipwhite nextgroup=@mnvCmdList
+
+" Debuggreedy {{{2
+" ===========
+" TODO: special-cased until generalised range/count support is implemented
+syn match	mnvDebuggreedy	"\<0\=debugg\%[reedy]\>" contains=mnvCount
+
+" Defer {{{2
+" =====
+syn match	mnvDefer	"\<defer\=\>"	skipwhite nextgroup=@mnvFunc,mnv9LambdaParams
+
+" *Do commands {{{2
+" ============
+syn match	mnvDoCommandBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvCmdList
+
+syn keyword	mnvDoCommand	argdo bufd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	tabd[o] wind[o]		skipwhite nextgroup=@mnvCmdList
+syn keyword	mnvDoCommand	cdo cfd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	ld[o] lfd[o]		skipwhite nextgroup=mnvDoCommandBang,@mnvCmdList
+syn keyword	mnvDoCommand	foldd[oopen] folddoc[losed]	skipwhite nextgroup=@mnvCmdList
+
+" Exception Handling {{{2
+syn keyword	mnvThrow	th[row]	skipwhite nextgroup=@mnvExprList
+syn keyword	mnvCatch	cat[ch]	skipwhite nextgroup=mnvCatchPattern
+syn region	mnvCatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@mnvSubstList oneline
+
+" Export {{{2
+" ======
+if s:mnv9script
+  syn keyword	mnv9Export	export	skipwhite nextgroup=mnv9Abstract,mnv9ClassBody,mnv9Const,mnv9Def,mnv9EnumBody,mnv9Final,mnv9InterfaceBody,mnv9Type,mnv9Var
+endif
+
+" Filetypes {{{2
+" =========
+syn match   mnvFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=mnvFTCmd,mnvFTOption,mnvFTError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_mnvFTError")
+ syn match   mnvFTError  contained	"\I\i*"
+endif
+syn keyword mnvFTCmd    contained	filet[ype]
+syn keyword mnvFTOption contained	detect indent off on plugin
+
+" History {{{2
+" =======
+" TODO: handle MNV9 "history" variable assignment (like :wincmd, but a common variable name)
+syn keyword	mnvHistory	his[tory]	skipwhite nextgroup=mnvHistoryName,mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn keyword	mnvHistoryName	contained	c[md] s[earch] e[xpr] i[nput] d[ebug] a[ll]	skipwhite nextgroup=mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryName	contained	"[:/?=@>]"			skipwhite nextgroup=mnvHistoryRange,mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	"-\=\<\d\+\>\%(\s*,\)\="		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	",\s*-\=\d\+\>"			skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvHistoryRange	contained	"-\=\<\d\+\s*,\s*-\=\d\+\>"		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" Import {{{2
+" ======
+syn keyword	mnvImportAutoload	contained	autoload	skipwhite nextgroup=mnvImportFilename
+if s:mnv9script
+  syn region	mnvImportFilename contained
+        \ start="\S"
+        \ skip=+\%#=1
+          "\ continuation operators at SOL
+          \\n\%(\s*#.*\n\)*\s*\%([[:punct:]]\+\&[^#"'(]\)
+            \\|
+          "\ continuation operators at EOL
+          \\%(\%([[:punct:]]\+\&[^#"')]\)\s*\%(#.*\)\=\)\@<=$
+            \\|
+          \\n\%(\s*#.*\n\)*\s*as\s
+            \\|
+          \\%(^\s*#.*\)\@<=$
+            \\|
+          \\n\s*\%(\\\|#\\ \)
+        \+
+        \ matchgroup=mnvCommand
+        \ end="\s\+\zsas\ze\s\+\h"
+        \ matchgroup=NONE
+        \ end="$"
+        \ skipwhite nextgroup=mnvImportName
+        \ contains=@mnv9Continue,@mnvExprList,mnv9Comment
+        \ transparent
+else
+  syn region	mnvImportFilename contained
+        \ start="\S"
+        \ skip=+\n\s*\%(\\\|"\\ \)+
+        \ matchgroup=mnvCommand
+        \ end="\s\+\zsas\ze\s\+\h"
+        \ matchgroup=NONE
+        \ end="$"
+        \ skipwhite nextgroup=mnvImportName
+        \ contains=@mnvContinue,@mnvExprList
+        \ transparent
+endif
+syn match	mnvImportName	contained	"\%(\<as\s\+\)\@<=\h\w*\>"	skipwhite nextgroup=@mnvComment
+syn match	mnvImport		"\<imp\%[ort]\>"		skipwhite nextgroup=mnvImportAutoload,mnvImportFilename
+
+" Language {{{2
+" ========
+syn keyword 	mnvLanguage		lan[guage]	skipwhite nextgroup=@mnvLanguageName,mnvLanguageCategory,mnvSep,mnvComment,mnv9Comment
+syn keyword	mnvLanguageCategory	contained	col[late] cty[pe] mes[sages] tim[e]	skipwhite nextgroup=@mnvLanguageName
+
+" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX"
+syn match	mnvLanguageName		contained	"[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]"	nextgroup=mnvSep,mnvComment,mnv9Comment
+syn keyword	mnvLanguageNameReserved	contained	C POSIX			nextgroup=mnvSep,mnvComment,mnv9Comment
+syn cluster	mnvLanguageName	contains=mnvLanguageName,mnvLanguageNameReserved
+
+" Augroup : mnvAugroupError removed because long augroups caused sync'ing problems. {{{2
+" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
+syn cluster mnvAugroupList	contains=@mnvCmdList,mnvFilter,@mnvFunc,mnvLineComment,mnvSpecFile,mnvOper,mnvNumber,mnvOperParen,@mnvComment,mnvString,mnvSubst,mnvRegister,mnvCmplxRepeat,mnvNotation,mnvCtrlChar,mnvContinue
+
+" define
+MNVFolda syn region mnvAugroup
+      \ start="\<aug\%[roup]\>\ze\s\+\%([eE][nN][dD]\%($\|[[:space:]|"#]\)\)\@!\S"
+      \ matchgroup=mnvAugroupKey
+      \ end="\<aug\%[roup]\ze\s\+[eE][nN][dD]\s*\%($\|[|"#]\)"
+      \ skipwhite nextgroup=mnvAugroupEnd
+      \ contains=mnvAutocmd,@mnvAugroupList,mnvAugroupkey
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_noaugrouperror")
+  syn match	mnvAugroupError	"\<aug\%[roup]\s\+[eE][nN][dD]\ze\s*\%($\|[|"#]\)"
+endif
+
+" TODO: MNV9 comment
+syn match	mnvAugroupName	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+"
+      \                                                                 skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvAugroupEnd	contained	"\c\<END\>"	skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvAugroupBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvAugroupName
+syn keyword	mnvAugroupKey	contained	aug[roup] 	skipwhite nextgroup=mnvAugroupBang,mnvAugroupName,mnvAugroupEnd
+
+" remove
+syn match	mnvAugroup	"\<aug\%[roup]!"		skipwhite nextgroup=mnvAugroupName contains=mnvAugroupKey,mnvAugroupBang
+
+" list
+MNVL syn match	mnvAugroup	"\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"	skipwhite nextgroup=mnvCmdSep,mnvComment  contains=mnvAugroupKey
+MNV9 syn match 	mnvAugroup	"\<aug\%[roup]\>\ze\s*\%([#|]\|$\)"	skipwhite nextgroup=mnvCmdSep,mnv9Comment contains=mnvAugroupKey
+
+" Operators: {{{2
+" =========
+syn cluster	mnvOperGroup	contains=@mnvContinue,@mnvExprList,mnv9Comment,mnv9LineComment,mnvContinueString
+syn match	mnvOper	"\a\@<!!"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvSpecFile
+syn match	mnvOper	"||\|&&\|[-+*/%.]"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvSpecFile
+syn match	mnvOper	"?"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+" distinguish ternary : from ex-colon
+syn match	mnvOper	"\s\@1<=:\ze\s\|\s\@1<=:$"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+syn match	mnvOper	"??"			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString
+syn match	mnvOper	"="			skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn match	mnvOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList,mnvContinueString,mnvSpecFile
+syn region	mnvOperParen 		matchgroup=mnvParenSep start="("    end=")" contains=@mnvOperGroup nextgroup=mnvSubscript
+syn region	mnvOperParen		matchgroup=mnvSep	     start="#\={" end="}" contains=@mnvOperGroup nextgroup=mnvSubscript,mnvVar
+syn region	mnvOperParen	contained	matchgroup=mnvSep	     start="\["	end="]" contains=@mnvOperGroup nextgroup=mnvSubscript,mnvVar
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_noopererror")
+ syn match	mnvOperError	")"
+endif
+
+syn match	mnvOperContinue		contained	"^\s*\\"        skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList contains=mnvWhitespace
+syn match         mnvOperContinueComment	contained	'^\s*["#]\\ .*' skipwhite skipnl nextgroup=@mnvOperContinue,@mnvExprList contains=mnvWhitespace
+syn cluster	mnvOperContinue		contains=mnvOperContinue,mnvOperContinueComment
+
+" Lambda Expressions: {{{2
+" ==================
+syn match	mnvLambdaOperator	contained	"->" skipwhite nextgroup=@mnvExprList
+syn region	mnvLambda	contained
+      \ matchgroup=mnvLambdaBrace
+      \ start=+{\ze[[:space:][:alnum:]_.,]*\%(\n\s*\%(\\[[:space:][:alnum:]_.,]*\|"\\ .*\)\)*->+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="}" end="$"
+      \ contains=@mnvContinue,@mnvExprList,mnvLambdaParams
+syn match	mnvLambdaParams	contained	"\%({\n\=\)\@1<=\_.\{-}\%(->\)\@=" nextgroup=mnvLambdaOperator contains=@mnvContinue,mnvFunctionParam
+
+syn match	mnv9LambdaOperator   contained	"=>" skipwhite skipempty nextgroup=@mnvExprList,mnv9LambdaBlock,mnv9LambdaOperatorComment
+syn match	mnv9LambdaParen      contained	"[()]"
+syn match	mnv9LambdaParams	   contained
+      \ "(\%(\<func(\|[^(]\)*\%(\n\s*\\\%(\<func(\|[^(]\)*\|\n\s*#\\ .*\)*\ze\s\+=>"
+      \ skipwhite nextgroup=mnv9LambdaOperator
+      \ contains=@mnv9Continue,mnvDefParam,mnv9LambdaParen,mnv9LambdaReturnType
+syn region	mnv9LambdaReturnType contained	start=")\@<=:\s" end="\ze\s*#" end="\ze\s*=>" contains=@mnv9Continue,@mnvType transparent
+syn region	mnv9LambdaBlock	   contained	matchgroup=mnvSep start="{" end="^\s*\zs}" contains=@mnvDefBodyList
+
+syn match	mnv9LambdaOperatorComment contained "#.*" skipwhite skipempty nextgroup=@mnvExprList,mnv9LambdaBlock,mnv9LambdaOperatorComment
+
+" Functions: Tag is provided for those who wish to highlight tagged functions {{{2
+" =========
+syn cluster	mnvFunctionBodyCommon	contains=@mnvCmdList,mnvCmplxRepeat,mnvContinue,mnvCtrlChar,mnvDef,mnvFBVar,mnvFunction,mnvNotFunc,mnvNumber,mnvOper,mnvOperParen,mnvRegister,mnvSpecFile,mnvString,mnvSubst,mnvFunctionFold,mnvDefFold,mnvCmdSep
+syn cluster	mnvFunctionBodyList	contains=@mnvFunctionBodyCommon,mnvComment,mnvLineComment,mnvInsert,mnvConst,mnvLet,mnvSearch
+syn cluster	mnvDefBodyList		contains=@mnvFunctionBodyCommon,mnv9Comment,mnv9LineComment,mnv9Block,mnv9Const,mnv9Final,mnv9Var,mnv9Null,mnv9Boolean,mnv9For,mnv9LhsVariable,mnv9LhsVariableList,mnv9LhsRegister,mnv9Search,@mnvSpecialVar,@mnv9Func
+
+syn region	mnvFunctionPattern	contained
+      \ matchgroup=mnvOper
+      \ start="/"
+      \ end="$"
+      \ contains=@mnvSubstList
+
+syn match	mnvFunctionBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvFunctionName
+syn match	mnvDefBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvDefName
+syn match	mnvFunctionSID	contained	"\c<sid>"
+syn match	mnvFunctionScope	contained	"\<[bwglstav]:"
+syn match	mnvFunctionName	contained
+      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
+      \ skipwhite nextgroup=mnvFunctionParams,mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=mnvFunctionError,mnvFunctionScope,mnvFunctionSID,Tag
+syn match	mnvDefName	contained
+      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
+      \ nextgroup=mnvDefTypeParams,mnvDefParams,mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=mnvFunctionError,mnvFunctionScope,mnvFunctionSID,Tag
+
+syn match	mnvFunction	"\<fu\%[nction]\>"	skipwhite nextgroup=mnvFunctionBang,mnvFunctionName,mnvFunctionPattern,mnvCmdSep,mnvComment
+syn match	mnvDef	"\<def\>"		skipwhite nextgroup=mnvDefBang,mnvDefName,mnvFunctionPattern,mnvCmdSep,mnvComment
+
+syn region	mnvFunctionComment	contained
+      \ start=+".*+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="$"
+      \ skipwhite skipempty nextgroup=mnvFunctionBody,mnvEndfunction
+syn region	mnvDefComment	contained
+      \ start="#.*"
+      \ skip=+\n\s*\%(\\\|#\\ \)+
+      \ end="$"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvEnddef
+
+syn region	mnvFunctionParams	contained
+      \ matchgroup=Delimiter
+      \ start="("
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end=")"
+      \ skipwhite skipempty nextgroup=mnvFunctionBody,mnvFunctionComment,mnvEndfunction,mnvFunctionMod,mnv9CommentError
+      \ contains=mnvFunctionParam,mnvOperParen,@mnvContinue
+syn region	mnvDefParams	contained
+      \ matchgroup=Delimiter
+      \ start="("
+      \ end=")"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvDefComment,mnvEnddef,mnvReturnType,mnvCommentError
+      \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals,mnvOperParen
+syn region	mnvDefTypeParams	contained
+      \ matchgroup=Delimiter
+      \ start="<"
+      \ end=">"
+      \ nextgroup=mnvDefParams
+      \ contains=mnv9DefTypeParam
+syn match	mnvFunctionParam	contained	"\<\h\w*\>\|\.\.\."	skipwhite nextgroup=mnvFunctionParamEquals
+syn match	mnvDefParam	contained	"\<\h\w*\>"		skipwhite nextgroup=mnvParamType,mnvFunctionParamEquals
+syn match	mnv9DefTypeParam	contained	"\<\u\w*\>"
+
+syn match	mnvFunctionParamEquals contained	"="			skipwhite	  nextgroup=@mnvExprList
+syn match	mnvFunctionMod	     contained	"\<\%(abort\|closure\|dict\|range\)\>"	skipwhite skipempty nextgroup=mnvFunctionBody,mnvFunctionComment,mnvEndfunction,mnvFunctionMod,mnv9CommentError
+
+syn region	mnvFunctionBody	contained
+      \ start="^."
+      \ matchgroup=mnvCommand
+      \ end="\<endfu\%[nction]\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9CommentError
+      \ contains=@mnvFunctionBodyList
+syn region	mnvDefBody	contained
+      \ start="^."
+      \ matchgroup=mnvCommand
+      \ end="\<enddef\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+      \ contains=@mnvDefBodyList
+
+syn match	mnvEndfunction	"\<endf\%[unction]\>"	skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9CommentError
+syn match	mnvEnddef	"\<enddef\>"		skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+
+if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# 'f'
+  syn region	mnvFunctionFold
+        \ start="\<fu\%[nction]!"
+        "\ assume no dict literal in curly-brace name expressions
+        \ start="\<fu\%[nction]\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+\s*("
+        \ end="^\s*:\=\s*endf\%[unction]\>"
+        \ contains=mnvFunction
+        \ extend fold keepend transparent
+  syn region	mnvDefFold
+        \ start="\<def!"
+        "\ assume no dict literal in curly-brace name expressions
+        \ start="\<def\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+[<(]"
+        \ end="^\s*:\=\s*enddef\>"
+        \ contains=mnvDef
+        \ extend fold keepend transparent
+endif
+
+syn match	mnvDelfunctionBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvFunctionName
+syn match	mnvDelfunction			"\<delf\%[unction]\>"	skipwhite nextgroup=mnvDelfunctionBang,mnvFunctionName
+
+" Types: {{{2
+" =====
+
+syn region	mnvReturnType	contained
+      \ start=":\%(\s\|\n\)\@="
+      \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
+      \ end="$"
+      \ matchgroup=mnv9Comment
+      "\ allow for legacy script tail comment error
+      \ end="\ze[#"]"
+      \ skipwhite skipempty nextgroup=mnvDefBody,mnvDefComment,mnvEnddef,mnvCommentError
+      \ contains=@mnv9Continue,@mnvType
+      \ transparent
+syn match	mnvParamType	contained	":\s"	skipwhite skipnl nextgroup=@mnvType contains=mnvTypeSep
+
+syn match	mnvTypeSep	contained	":\%(\s\|\n\)\@=" skipwhite nextgroup=@mnvType
+syn keyword	mnvType	contained	blob bool channel float job number string void
+syn keyword	mnvTypeAny	contained	any
+syn match	mnvTypeObject	contained	"\<object<\@="	nextgroup=mnvTypeObjectArgs
+syn region	mnvTypeObjectArgs	contained
+      \ matchgroup=mnvTypeObjectBracket
+      \ start="<"
+      \ end=">"
+      \ contains=mnvTypeAny,mnvTypeObject,mnvUserType
+      \ oneline
+      \ transparent
+syn match	mnvType	contained	"\<\%(func\)\>"
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<func("	          end=")" nextgroup=mnvTypeSep contains=@mnv9Continue,@mnvType transparent
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<tuple<"           end=">"                      contains=@mnv9Continue,@mnvType transparent
+syn region	mnvCompoundType	contained	matchgroup=mnvType start="\<\%(list\|dict\)<" end=">"		   contains=@mnvType oneline       transparent
+syn match	mnvUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"
+
+syn cluster mnvType contains=mnvType,mnvTypeAny,mnvTypeObject,mnvCompoundType,mnvUserType
+
+" Classes, Enums And Interfaces: {{{2
+" =============================
+
+if s:mnv9script
+
+  " Methods {{{3
+  syn match	mnv9MethodDef		contained	"\<def\>"	skipwhite nextgroup=mnv9MethodDefName,mnv9ConstructorDefName
+  syn match	mnv9MethodDefName		contained	"\<\h\w*\>"	nextgroup=mnv9MethodDefParams,mnv9MethodDefTypeParams contains=@mnv9MethodName
+  syn region	mnv9MethodDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnv9MethodDefReturnType,mnvCommentError
+        \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9MethodDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9MethodDefParams
+        \ contains=mnv9DefTypeParam
+
+  syn match	mnv9ConstructorDefName	contained	"\<_\=new\w*\>"
+        \ nextgroup=mnv9ConstructorDefParams,mnv9ConstuctorDefTypeParams
+        \ contains=@mnv9MethodName
+  syn match	mnv9ConstructorDefParam	contained	"\<\%(this\.\)\=\h\w*\>"
+        \ skipwhite nextgroup=mnvParamType,mnvFunctionParamEquals
+        \ contains=mnv9This,mnvOper
+  syn region	mnv9ConstructorDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnvCommentError
+        \ contains=mnv9ConstructorDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9ConstuctorDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9ConstructorDefParams
+        \ contains=mnv9DefTypeParam
+
+  syn region	mnv9MethodDefReturnType	contained
+        \ start=":\%(\s\|\n\)\@="
+        \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
+        \ end="$"
+        \ matchgroup=mnv9Comment
+        \ end="\ze#"
+        \ skipwhite skipnl nextgroup=mnv9MethodDefBody,mnv9MethodDefComment,mnvEnddef,mnvCommentError
+        \ contains=@mnv9Continue,mnvType,mnvTypeSep
+        \ transparent
+
+  syn region	mnv9MethodDefComment	contained
+        \ start="#.*"
+        \ skip=+\n\s*\%(\\\|#\\ \)+
+        \ end="$"
+        \ skipwhite skipempty nextgroup=mnv9MethodDefBody,mnvEnddef
+
+  syn region	mnv9MethodDefBody		contained
+        \ start="^.\=" matchgroup=mnvCommand end="\<enddef\>"
+        \ skipwhite nextgroup=mnvCmdSep,mnv9Comment,mnvCommentError
+        \ contains=@mnv9MethodDefBodyList
+
+  syn cluster	mnv9MethodDefBodyList contains=@mnvDefBodyList,mnv9This,mnv9Super
+
+  if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvfunctionerror")
+    syn match	mnv9MethodNameError contained	"\<[a-z0-9]\i\>"
+  endif
+  syn match	mnv9MethodName	contained	"\<_\=new\w*\>"
+  syn keyword	mnv9MethodName	contained	empty len string
+
+  syn cluster	mnv9MethodName	contains=mnv9MethodName,mnv9MethodNameError
+
+  if exists("g:mnvsyn_folding") && g:mnvsyn_folding =~# 'f'
+    syn region	mnv9MethodDefFold	contained
+          \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]"
+          \ end="^\s*:\=enddef\>"
+          \ contains=mnv9MethodDef
+          \ fold keepend extend transparent
+  endif
+
+  syn cluster mnv9MethodDef contains=mnv9MethodDef,mnv9MethodDefFold
+
+  " Classes {{{3
+  syn cluster	mnv9ClassBodyList		contains=mnv9Abstract,mnv9Class,mnv9Comment,mnv9LineComment,@mnv9Continue,@mnvExprList,mnv9Extends,mnv9Implements,@mnv9MethodDef,mnv9Public,mnv9Static,mnv9Const,mnv9Final,mnv9This,mnv9Super,mnv9Var
+
+  syn match	mnv9Class		contained	"\<class\>"	skipwhite        nextgroup=mnv9ClassName
+  syn match	mnv9ClassName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Extends,mnv9Implements
+  syn match	mnv9SuperClass		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Implements
+  syn match	mnv9ImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9InterfaceListComma,mnv9Extends
+  syn match	mnv9InterfaceListComma	contained	","	skipwhite skipnl nextgroup=mnv9ImplementedInterface
+  syn keyword	mnv9Abstract			abstract	skipwhite skipnl nextgroup=mnv9ClassBody,mnv9AbstractDef
+  syn keyword	mnv9Extends		contained	extends	skipwhite skipnl nextgroup=mnv9SuperClass
+  syn keyword	mnv9Implements		contained	implements	skipwhite skipnl nextgroup=mnv9ImplementedInterface
+  syn keyword	mnv9Public		contained	public
+  syn keyword	mnv9Static		contained	static
+  " FIXME: don't match as dictionary keys, remove when operators are not
+  "        shared between MNV9 and legacy script
+  syn match	mnv9This		contained	"\.\@1<!\<this\>:\@!"
+  " super must be followed by '.'
+  syn match	mnv9Super		contained	"\.\@1<!\<super\.\@="
+
+  MNVFoldc syn region	mnv9ClassBody	start="\<class\>" matchgroup=mnvCommand end="\<endclass\>" contains=@mnv9ClassBodyList transparent
+
+  " Enums {{{3
+  syn cluster	mnv9EnumBodyList		contains=mnv9Comment,mnv9LineComment,@mnv9Continue,mnv9Enum,@mnvExprList,@mnv9MethodDef,mnv9Public,mnv9Static,mnv9Const,mnv9Final,mnv9This,mnv9Var
+
+  syn match	mnv9Enum		contained	"\<enum\>"	skipwhite           nextgroup=mnv9EnumName
+
+  syn match	mnv9EnumName		contained	"\<\u\w*\>"	skipwhite skipempty nextgroup=mnv9EnumNameTrailing,mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue,mnv9EnumImplements
+  syn match	mnv9EnumNameTrailing	contained	"\S.*"
+  syn region	mnv9EnumNameComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumNameComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+  " mnv9EnumName's "skipempty" should only apply to comments and enum values and not implements clauses
+  syn match	mnv9EnumNameEmpty		contained	"^"	skipwhite skipempty nextgroup=mnv9EnumNameComment,mnv9EnumValue
+  " allow line continuation between enum name and "implements"
+  syn match	mnv9EnumNameContinue	contained
+        \ "^\s*\\"
+        \ skipwhite skipnl nextgroup=mnv9EnumNameTrailing,mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue,mnv9EnumImplements
+        \ contains=mnvWhitespace
+  syn match	mnv9EnumNameContinueComment	contained
+        \ "^\s*#\\ .*"
+        \ skipwhite skipnl nextgroup=mnv9EnumNameEmpty,mnv9EnumNameComment,@mnv9EnumNameContinue
+        \ contains=mnvWhitespace
+  syn cluster	mnv9EnumNameContinue	contains=mnv9EnumNameContinue,mnv9EnumNameContinueComment
+
+  " enforce enum value list location
+  syn match	mnv9EnumValue		contained	"\<\a\w*\>"		  nextgroup=mnv9EnumValueTypeArgs,mnv9EnumValueArgList,mnv9EnumValueListComma,mnv9Comment
+  syn match	mnv9EnumValueListComma	contained	","	skipwhite skipempty nextgroup=mnv9EnumValue,mnv9EnumValueListCommaComment
+  syn region	mnv9EnumValueListCommaComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumValueListCommaComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+  syn region	mnv9EnumValueTypeArgs	contained
+        \ matchgroup=Delimiter
+        \ start="<\ze\a"
+        \ end=">"
+        \ nextgroup=mnv9EnumValueArgList
+        \ contains=@mnvType
+        \ oneline
+  syn region	mnv9EnumValueArgList	contained
+        \ matchgroup=mnvParenSep start="(" end=")"
+        \ nextgroup=mnv9EnumValueListComma
+        \ contains=@mnvExprList,mnvContinueString,mnv9Comment
+
+  syn keyword	mnv9EnumImplements	contained	implements	skipwhite        nextgroup=mnv9EnumImplementedInterface
+  syn match	mnv9EnumImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9EnumInterfaceListComma,mnv9EnumImplementedInterfaceComment,mnv9EnumValue
+  syn match	mnv9EnumInterfaceListComma	contained	","	skipwhite        nextgroup=mnv9EnumImplementedInterface
+  syn region	mnv9EnumImplementedInterfaceComment	contained
+        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
+        \ skipwhite skipempty nextgroup=mnv9EnumImplementedInterfaceComment,mnv9EnumValue
+        \ contains=@mnvCommentGroup,mnvCommentString
+
+  MNVFolde syn region	mnv9EnumBody	start="\<enum\>" matchgroup=mnvCommand end="\<endenum\>" contains=@mnv9EnumBodyList transparent
+
+  " Interfaces {{{3
+  " TODO: limit to decl only - no init values
+  syn cluster	mnv9InterfaceBodyList	contains=mnv9Comment,mnv9LineComment,@mnv9Continue,mnv9Extends,mnv9Interface,mnv9AbstractDef,mnv9Var
+
+  syn match	mnv9Interface		contained	"\<interface\>"	skipwhite nextgroup=mnv9InterfaceName
+  syn match	mnv9InterfaceName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=mnv9Extends
+
+  syn keyword	mnv9AbstractDef		contained	def	skipwhite nextgroup=mnv9AbstractDefName
+  syn match	mnv9AbstractDefName	contained	"\<\h\w*\>"	skipwhite nextgroup=mnv9AbstractDefParams,mnv9AbstractDefTypeParams contains=@mnv9MethodName
+  syn region	mnv9AbstractDefParams	contained
+        \ matchgroup=Delimiter start="(" end=")"
+        \ skipwhite skipnl nextgroup=mnvDefComment,mnv9AbstractDefReturnType,mnvCommentError
+        \ contains=mnvDefParam,mnv9Comment,mnvFunctionParamEquals
+  syn region	mnv9AbstractDefReturnType	contained
+        \ start=":\s" end="$" matchgroup=mnv9Comment end="\ze[#"]"
+        \ skipwhite skipnl nextgroup=mnvDefComment,mnvCommentError
+        \ contains=mnvTypeSep
+        \ transparent
+  syn region	mnv9AbstractDefTypeParams	contained
+        \ matchgroup=Delimiter
+        \ start="<"
+        \ end=">"
+        \ nextgroup=mnv9AbstractDefParams
+        \ contains=mnv9DefTypeParam
+
+  MNVFoldi syn region	mnv9InterfaceBody	start="\<interface\>" matchgroup=mnvCommand end="\<endinterface\>" contains=@mnv9InterfaceBodyList transparent
+
+  " Type Aliases {{{3
+  syn match	mnv9Type		"\<ty\%[pe]\>"	skipwhite nextgroup=mnv9TypeAlias,mnv9TypeAliasError
+  syn match	mnv9TypeAlias	 contained	"\<\u\w*\>"	skipwhite nextgroup=mnv9TypeEquals
+  syn match	mnv9TypeEquals	 contained	"="	skipwhite nextgroup=@mnvType
+  if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_notypealiaserror")
+    syn match	mnv9TypeAliasError contained	"\<\l\w*\>"	skipwhite nextgroup=mnv9TypeEquals
+  endif
+endif
+
+" Blocks: {{{2
+" ======
+MNV9 syn region	mnv9Block
+      \ matchgroup=mnvSep
+      \ start="{\ze\s*\%($\|[#|]\)"
+      \ end="^\s*\zs}"
+      \ skipwhite nextgroup=mnv9Comment,mnvCmdSep
+      \ contains=@mnvDefBodyList
+
+" Keymaps: {{{2
+" =======
+
+syn match  mnvKeymapStart	"^"	contained skipwhite nextgroup=mnvKeymapLhs,@mnvKeymapLineComment
+syn match  mnvKeymapLhs	"\S\+"	contained skipwhite nextgroup=mnvKeymapRhs contains=mnvNotation
+syn match  mnvKeymapRhs	"\S\+"	contained skipwhite nextgroup=mnvKeymapTailComment contains=mnvNotation
+syn match  mnvKeymapTailComment	"\S.*"	contained
+
+" TODO: remove when :" comment is matched in parts as "ex-colon comment" --djk
+if s:mnv9script
+  syn match  mnv9KeymapLineComment	"#.*"	contained contains=@mnvCommentGroup,mnvCommentString,mnv9CommentTitle
+else
+  syn match  mnvKeymapLineComment	+".*+	contained contains=@mnvCommentGroup,mnvCommentString,mnvCommentTitle
+endif
+syn cluster mnvKeymapLineComment contains=mnv9\=KeymapLineComment
+
+syn region mnvLoadkeymap matchgroup=mnvCommand start="\<loadk\%[eymap]\>" end="\%$" contains=mnvKeymapStart
+
+" Special Filenames, Modifiers, Extension Removal: {{{2
+" ===============================================
+syn match	mnvSpecFile	"<c\(word\|WORD\)>"	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%$"ms=s+1		nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFile	"#\d\+\|[#%]<\>"		nextgroup=mnvSpecFileMod,mnvSubst1
+syn match	mnvSpecFileMod	"\(:[phtre]\)\+"	contained
+
+syn match	mnvSpecFile	contained		"%[ \t:]"me=e-1	nextgroup=mnvSpecFileMod
+syn match	mnvSpecFile	contained	excludenl	"%$"	nextgroup=mnvSpecFileMod
+syn match	mnvSpecFile	contained		"%<"me=e-1	nextgroup=mnvSpecFileMod
+
+" User-Specified Commands: {{{2
+" =======================
+syn cluster	mnvUserCmdList	contains=@mnvCmdList,mnvCmplxRepeat,@mnvComment,mnvCtrlChar,mnvEscapeBrace,@mnvFunc,mnvNotation,mnvNumber,mnvOper,mnvRegister,mnvSpecFile,mnvString,mnvSubst,mnvSubstRep,mnvSubstRange
+
+syn match	mnvUserCmd	"\<com\%[mand]\>!\="		skipwhite        nextgroup=mnvUserCmdAttrs,mnvUserCmdName contains=mnvBang
+syn match	mnvUserCmd	+\<com\%[mand]\>!\=\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvUserCmdAttrs,mnvUserCmdName contains=mnvBang
+
+syn region	mnvUserCmdAttrs	    contained
+      \ start="-\l"
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ end="\ze\s\u"
+      \ skipwhite nextgroup=mnvUserCmdName
+      \ contains=@mnvContinue,mnvUserCmdAttr,mnvUserCmdAttrError
+      \ transparent
+syn match	mnvUserCmdAttrError contained	"-\a\+\ze\%(\s\|=\)"
+syn match	mnvUserCmdAttr	  contained	"-addr="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrAddr
+syn match	mnvUserCmdAttr	  contained	"-bang\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-bar\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-buffer\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-complete="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrComplete,mnvUserCmdError
+syn match	mnvUserCmdAttr	  contained	"-count\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-count="		contains=mnvUserCmdAttrKey nextgroup=mnvNumber
+syn match	mnvUserCmdAttr	  contained	"-keepscript\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-nargs="		contains=mnvUserCmdAttrKey nextgroup=mnvUserCmdAttrNargs
+syn match	mnvUserCmdAttr	  contained	"-range\>"		contains=mnvUserCmdAttrKey
+syn match	mnvUserCmdAttr	  contained	"-range="		contains=mnvUserCmdAttrKey nextgroup=mnvNumber,mnvUserCmdAttrRange
+syn match	mnvUserCmdAttr	  contained	"-register\>"		contains=mnvUserCmdAttrKey
+
+syn match	mnvUserCmdAttrNargs	contained	"[01*?+]"
+syn match	mnvUserCmdAttrRange	contained	"%"
+
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nousercmderror")
+ syn match	mnvUserCmdError	contained	"\S\+\>"
+endif
+
+syn case ignore
+syn keyword	mnvUserCmdAttrKey   contained	a[ddr] ban[g] bar bu[ffer] com[plete] cou[nt] k[eepscript] n[args] ra[nge] re[gister]
+
+" GEN_SYN_MNV: mnvUserCmdAttrComplete, START_STR='syn keyword mnvUserCmdAttrComplete contained', END_STR=''
+syn keyword mnvUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype filetypecmd function help highlight history keymap locale mapclear mapping menu messages option packadd retab runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
+syn keyword mnvUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype function help highlight history keymap locale mapclear mapping menu messages option packadd runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
+syn keyword	mnvUserCmdAttrComplete	contained	custom customlist nextgroup=mnvUserCmdAttrCompleteFunc,mnvUserCmdError
+syn match	mnvUserCmdAttrCompleteFunc	contained	",\%([bwglstav]:\|<[sS][iI][dD]>\)\=\h\w*\%([.#]\h\w*\)*"hs=s+1 nextgroup=mnvUserCmdError contains=mnvVarScope,mnvFunctionSID
+
+" GEN_SYN_MNV: mnvUserCmdAttrAddr, START_STR='syn keyword mnvUserCmdAttrAddr contained', END_STR=''
+syn keyword mnvUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
+syn keyword mnvUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
+syn match	mnvUserCmdAttrAddr     contained	"?"
+syn case match
+
+syn match	mnvUserCmdName	    contained	"\<\u[[:alnum:]]*\>"		skipwhite        nextgroup=mnvUserCmdBlock,mnvUserCmdReplacement
+syn match	mnvUserCmdName	    contained	+\<\u[[:alnum:]]*\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvUserCmdBlock,mnvUserCmdReplacement
+syn region	mnvUserCmdReplacement contained
+      \ start="\S"
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue,@mnvUserCmdList,mnvComFilter
+      \ keepend
+syn region	mnvUserCmdBlock	    contained
+      \ matchgroup=mnvSep
+      \ start="{"
+      \ end="^\s*\zs}"
+      \ contains=@mnvDefBodyList,@mnvUserCmdList
+
+syn match	mnvDelcommand		"\<delc\%[ommand]\>"	skipwhite nextgroup=mnvDelcommandAttr,mnvDelcommandName
+syn match	mnvDelcommandAttr	contained	"-buffer\>"		skipwhite nextgroup=mnvDelcommandName
+syn match	mnvDelcommandName	contained	"\<\u[[:alnum:]]*\>"
+
+" Lower Priority Comments: after some mnv commands... {{{2
+" =======================
+if get(g:, "mnvsyn_comment_strings", 1)
+  syn region	mnvCommentString	contained oneline start='\S\s\+"'ms=e end='"' extend
+endif
+
+if s:mnv9script
+  syn cluster mnvComment contains=mnv9Comment
+else
+  syn cluster mnvComment contains=mnvComment
+endif
+
+MNVL syn region	mnvComment
+      \ excludenl
+      \ start=+"+
+      \ skip=+\n\s*\%(\\\|"\\ \)+
+      \ end="$"
+      \ contains=@mnvCommentGroup,mnvCommentString
+      \ extend
+MNV9 syn region	mnv9Comment
+      \ excludenl
+      \ start="\%#=1\s\@1<=#\%({\@!\|{{\)"
+      \ skip="\n\s*\%(\\\|#\\ \)"
+      \ end="$"
+      \ contains=@mnvCommentGroup,mnvCommentString
+      \ extend
+
+syn match	mnv9CommentError	contained	"#.*"
+syn match	mnvCommentError	contained	+".*+
+
+" Environment Variables: {{{2
+" =====================
+syn match	mnvEnvvar	"\$\I\i*"
+syn match	mnvEnvvar	"\${\I\i*}"
+
+" Strings {{{2
+" =======
+
+" In-String Specials:
+" Try to catch strings, if nothing else matches (therefore it must precede the others!)
+"  mnvEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
+" syn region	mnvEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
+syn match	mnvPatSepErr	contained	"\\)"
+syn match	mnvPatSep	contained	"\\|"
+syn region	mnvPatSepZone	oneline   contained   matchgroup=mnvPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@mnvStringGroup
+syn region	mnvPatRegion	contained transparent matchgroup=mnvPatSepR start="\\[z%]\=(" end="\\)"	contains=@mnvSubstList oneline
+syn match	mnvNotPatSep	contained	"\\\\"
+syn cluster	mnvStringGroup	contains=mnvEscape,mnvEscapeBrace,mnvPatSep,mnvNotPatSep,mnvPatSepErr,mnvPatSepZone,@Spell
+syn region	mnvString	oneline keepend	matchgroup=mnvString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=mnvStringEnd end=+"+ nextgroup=mnvSubscript contains=@mnvStringGroup extend
+syn region	mnvString	oneline	matchgroup=mnvString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=mnvSubscript contains=mnvQuoteEscape  extend
+"syn region	mnvString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@mnvStringGroup  " see tst45.mnv
+
+syn match	mnvEscape	contained	"\\."
+" syn match	mnvEscape	contained	+\\[befnrt\"]+
+syn match	mnvEscape	contained	"\\\o\{1,3}\|\\[xX]\x\{1,2}\|\\u\x\{1,4}\|\\U\x\{1,8}"
+syn match	mnvEscape	contained	"\\<" contains=mnvNotation
+syn match	mnvEscape	contained	"\\<\*[^>]*>\=>"
+syn match	mnvQuoteEscape	contained	"''"
+
+syn region	mnvString	oneline matchgroup=mnvString start=+$'+ end=+'+ nextgroup=mnvSubscript contains=@mnvStringInterpolation,mnvQuoteEscape  extend
+syn region	mnvString	oneline matchgroup=mnvString start=+$"+ end=+"+ nextgroup=mnvSubscript contains=@mnvStringInterpolation,@mnvStringGroup extend
+syn region	mnvStringInterpolationExpr  oneline contained matchgroup=mnvSep start=+{+ end=+}+ contains=@mnvExprList
+syn match	mnvStringInterpolationBrace contained "{{"
+syn match	mnvStringInterpolationBrace contained "}}"
+syn cluster	mnvStringInterpolation contains=mnvStringInterpolationExpr,mnvStringInterpolationBrace
+
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringGroup
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,mnvQuoteEscape
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringInterpolation,@mnvStringGroup
+syn region	mnvContinueString	contained	matchgroup=mnvContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=mnvSubscript,mnvComment contains=@mnvContinue,@mnvStringInterpolation,mnvQuoteEscape
+
+" Substitutions: {{{2
+" =============
+syn cluster	mnvSubstList	contains=mnvPatSep,mnvPatRegion,mnvPatSepErr,mnvSubstTwoBS,mnvSubstRange,mnvNotation
+syn cluster	mnvSubstRepList	contains=mnvSubstSubstr,mnvSubstTwoBS,mnvNotation
+syn cluster	mnvSubstList	add=mnvCollection
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\>"		skipwhite nextgroup=mnvSubstPat,mnvSubstFlags,mnvSubstCount
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=mnvSubstPat
+syn match	mnvSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\>"		skipwhite nextgroup=mnvSubstPat,mnvSubstFlags,mnvSubstCount
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=mnvSubstPat
+syn match	mnvSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubstFlagErr	contained	"[^< \t\r|]\+" contains=mnvSubstFlags
+" & and # after :s are always pattern delimiters not flags
+syn match	mnvSubstFlags	contained	"[&cegiIlnpr#]\+"	skipwhite nextgroup=mnvSubstCount
+syn match	mnvSubstCount	contained	"\d\+\>"
+" TODO: MNV9 illegal separators for abbreviated :s form are [-.:], :su\%[...] required
+"     : # is allowed but "not recommended" (see :h pattern-delimiter)
+syn region	mnvSubstPat	contained	matchgroup=mnvSubstDelim start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	contains=@mnvSubstList	nextgroup=mnvSubstRep4	oneline
+syn region	mnvSubstRep4	contained	matchgroup=mnvSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=mnvNotation end="<[cC][rR]>"	contains=@mnvSubstRepList	nextgroup=mnvSubstFlagErr	oneline
+syn region	mnvCollection	contained 	transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=mnvCollClass
+syn match	mnvCollClassErr	contained	"\[:.\{-\}:\]"
+syn match	mnvCollClass	contained 	transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|retu\%[rn]\|tab\|escape\|backspace\):\]"
+syn match	mnvSubstSubstr	contained	"\\z\=\d"
+syn match	mnvSubstTwoBS	contained	"\\\\"
+
+" TODO: flags, unlike count, must follow immediately
+"     : distinguish from with MNV9 &var
+" syn match	mnvSubst		"^\s*\zs&&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst		"^\s*\zs\~&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst1	contained	"&&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+" syn match	mnvSubst1	contained	"\~&\="	skipwhite nextgroup=mnvSubstFlags,mnvSubstCount
+
+" two and three letter variants (matched as :s + flags, count may follow immediately)
+syn match	mnvSubst		"^\s*\zssc[egiIlnp]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssi[ceInpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssI[ceginplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst		"^\s*\zssr[cgiInplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+
+syn match	mnvSubst1	contained	"\<sc[egiIlnp]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<si[ceInpr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sI[ceginplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+syn match	mnvSubst1	contained	"\<sr[cgiInplr]\=\a\@!"	skipwhite nextgroup=mnvSubstCount	contains=mnvSubstFlags
+
+" Vi compatibility
+syn match	mnvSubstDelim	contained	"\\"
+syn match	mnvSubstPat	contained	"\\\ze[/?&]" contains=mnvSubstDelim nextgroup=mnvSubstRep4
+
+" Mark: {{{2
+" ====
+MNVL syn match	mnvExMark	"\<k\%([a-zA-Z0-9]\>\|[[\]<>'`]\)\@="         nextgroup=@mnvMarkArg
+MNVL syn match	mnvExMark	"\<k\>"	      	skipwhite nextgroup=@mnvMarkArg
+syn match	mnvExMark	"\<mark\>"	      	skipwhite nextgroup=@mnvMarkArg
+
+syn match	mnvMarkArg	contained	"[a-zA-Z]\>\|[[\]<>'`]"	skipwhite nextgroup=mnvCmdSep,mnvComment
+syn match	mnvMarkArgError	contained	"["^.(){}0-9]"
+syn cluster	mnvMarkArg	contains=mnvMarkArg,mnvMarkArgError
+
+" Marks, Registers, Addresses, Filters: {{{2
+syn match	mnvMark	"'[a-zA-Z0-9]\ze\s*$"
+syn match	mnvMark	"'[[\]{}()<>'`"^.]\ze\s*$"
+syn match	mnvMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	"'[[\]{}()<>'`"^.]\ze[-+,!]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	",\zs'[[\]{}()<>'`"^.]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=mnvFilter,mnvMarkNumber,mnvSubst1
+syn match	mnvMarkNumber	"[-+]\d\+"		contained contains=mnvOper nextgroup=mnvSubst1
+syn match	mnvPlainMark contained	"'[a-zA-Z0-9]"
+syn match	mnvRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=mnvMark	skipwhite nextgroup=mnvFilter
+
+syn match	mnvRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
+syn match	mnvRegister	'@"'
+syn match	mnvLetRegister	contained	'@["@0-9\-a-zA-Z:.%#=*+~_/]'
+
+syn match	mnvAddress	",\zs[.$]"	skipwhite nextgroup=mnvSubst1
+syn match	mnvAddress	"%\ze\a"	skipwhite nextgroup=mnvString,mnvSubst1
+
+syn match	mnvFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=mnvOper,mnvSpecFile
+syn match	mnvFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=mnvOper,mnvSpecFile
+syn match	mnvComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=mnvOper,mnvSpecFile
+
+" Complex Repeats: (:h complex-repeat) {{{2
+" ===============
+syn match	mnvCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
+
+" NOTE: :* as an alias for :@ is not supported, this is considered a :range,
+" see :help cpo-star
+syn match	mnvAtArg	contained	+@\@1<=[0-9a-z".=*+:@]+
+syn match	mnvAt	+@[0-9a-z".=*+:@]\ze\s*\%($\|[|"#]\)+	skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment contains=mnvAtArg
+" MNV9: avoid LHS assignment mismatching of :@["#]
+syn match	mnvAt	+@\ze\s*\%($\||\|\s["#]\)+		skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" Set command and associated set-options (mnvOptions) with comment {{{2
+syn match	mnvSet		"\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skipwhite nextgroup=mnvSetBang,mnvCmdSep,mnvComment,mnvSetArgs
+syn region	mnvSetComment	contained	start=+"+ skip=+\n\s*\%(\\\||"\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString extend
+syn match	mnvSetCmdSep	contained	"|" skipwhite nextgroup=@mnvCmdList,mnvSubst1,@mnvFunc
+syn match	mnvSetEscape	contained	"\\\%(\\[|"]\|.\)"
+syn match	mnvSetBarEscape	contained	"\\|"
+syn match	mnvSetQuoteEscape	contained	+\\"+
+syn region	mnvSetArgs	contained
+      \ start="\l\|<"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*"\\ +
+      \ end=+\ze\\\@1<![|"]+
+      "\ assume this isn't an escaped char with backslash on the previous line
+      \ end=+^\s*\\\ze[|"]+
+      \ end="\ze\s#"
+      \ end="$"
+      \ nextgroup=mnvSetCmdSep,mnvSetComment,mnv9Comment
+      \ contains=@mnvContinue,mnvErrSetting,mnvOption,mnvSetAll,mnvSetTermcap
+      \ keepend
+" TODO: restrict this to valid values?
+syn match	mnvOption	contained	"<[^>]\+>"	contains=mnvOption
+syn region	mnvSetEqual	contained
+      \ matchgroup=mnvOper
+      \ start="[=:]\|[-+^]="
+      \ skip=+\\\s\|^\s*\%(\\\|["#]\\ \)+
+      \ end="\ze\s"
+      \ contains=@mnvContinue,mnvCtrlChar,mnvEnvvar,mnvNotation,mnvSetSep,mnvSetEscape,mnvSetBarEscape,mnvSetQuoteEscape
+syn match	mnvSetBang	contained	"\a\@1<=!" skipwhite nextgroup=mnvSetAll,mnvSetTermcap
+syn keyword	mnvSetAll	contained	all nextgroup=mnvSetMod
+syn keyword	mnvSetTermcap	contained	termcap
+syn match	mnvSetSep	contained	"[,:]"
+syn match	mnvSetMod	contained	"\a\@1<=\%(&mnv\=\|[!&?<]\)"
+
+" Variable Declarations: {{{2
+" =====================
+MNVL syn keyword	mnvLet	let		skipwhite nextgroup=@mnvSpecialVar,mnvVar,mnvVarList,mnvLetVar
+MNVL syn keyword	mnvConst	cons[t]		skipwhite nextgroup=@mnvSpecialVar,mnvVar,mnvVarList,mnvLetVar
+syn region	mnvVarList	contained
+      \ start="\[" end="]"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnvContinue,@mnvSpecialVar,mnvVar
+syn match	mnvLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=mnvLetVarSubscript,mnvLetHeredoc	contains=mnvVarScope,mnvSubscript
+hi link mnvLetVar mnvVar
+syn region	mnvLetVarSubscript contained
+      \ matchgroup=mnvSubscriptBracket
+      \ start="\S\@1<=\["
+      \ end="]"
+      \ skipwhite nextgroup=mnvLetVarSubscript,mnvLetHeredoc
+      \ contains=@mnvExprList
+
+syn keyword	mnvUnlet		unl[et]	skipwhite nextgroup=mnvUnletBang,mnvUnletVars
+syn match	mnvUnletBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvUnletVars
+syn region	mnvUnletVars	contained
+      \ start="$\I\|\h" skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*["#]\\ + end="$" end=+\ze\s*[|"#]+
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+      \ contains=@mnvContinue,mnvEnvvar,mnvVar,mnvMNVVar
+
+" TODO: type error after register or environment variables (strings)
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*trim\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1\=\z2$"
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="=<<\%(\s*\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop end="^\z1$"
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*\%(trim\s\+eval\|eval\s\+trim\)\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1\=\z2$"
+      \ contains=@mnvStringInterpolation
+      \ extend
+MNVFoldh syn region mnvLetHeredoc	contained
+      \ matchgroup=mnvLetHeredocStart
+      \ start="=<<\s*eval\%(\s\+\)\@>\z(\L\S*\)"
+      \ matchgroup=mnvLetHeredocStop
+      \ end="^\z1$"
+      \ contains=@mnvStringInterpolation
+      \ extend
+
+MNV9 syn keyword	mnv9Const	const	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+MNV9 syn keyword	mnv9Final	final	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+MNV9 syn keyword	mnv9Var	var	skipwhite nextgroup=mnv9Variable,mnv9VariableList
+
+syn match	mnv9Variable	contained	"\<\h\w*\>"	skipwhite nextgroup=mnv9VariableTypeSep,mnvLetHeredoc,mnvOper
+syn region	mnv9VariableList	contained	start="\[" end="]" contains=@mnvContinue,@mnvSpecialVar,mnv9Variable skipwhite nextgroup=mnvLetHeredoc
+
+syn match	mnv9VariableTypeSep	contained	"\S\@1<=:\%(\s\|\n\)\@="		skipwhite nextgroup=@mnv9VariableType
+syn keyword	mnv9VariableType		contained	blob bool channel float job number string void	skipwhite nextgroup=mnvLetHeredoc
+syn keyword	mnv9VariableTypeAny	contained	any			skipwhite nextgroup=mnvLetHeredoc
+syn match	mnv9VariableTypeObject	contained	"\<object<\@="			          nextgroup=mnv9VariableTypeObjectArgs
+syn region	mnv9VariableTypeObjectArgs
+      \ matchgroup=mnv9VariableTypeObjectBracket
+      \ start="<"
+      \ end=">"
+      \ contains=mnvTypeAny,mnvTypeObject,mnvUserType
+      \ oneline
+      \ transparent
+syn match	mnv9VariableType		contained	"\<\%(func\)\>"			skipwhite nextgroup=mnvLetHeredoc
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<func("
+      \ end=")"
+      \ skipwhite nextgroup=mnv9VariableTypeSep,mnvLetHeredoc
+      \ contains=@mnv9Continue,@mnv9VariableType
+      \ transparent
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<tuple<"
+      \ end=">"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnv9Continue,@mnv9VariableType
+      \ transparent
+syn region	mnv9VariableCompoundType	contained
+      \ matchgroup=mnv9VariableType
+      \ start="\<\%(list\|dict\)<"
+      \ end=">"
+      \ skipwhite nextgroup=mnvLetHeredoc
+      \ contains=@mnv9VariableType
+      \ oneline
+      \ transparent
+syn match	mnv9VariableUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"	skipwhite nextgroup=mnvLetHeredoc
+
+syn cluster mnv9VariableType contains=mnv9VariableType,mnv9VariableTypeAny,mnv9VariableTypeObject,mnv9VariableCompoundType,mnv9VariableUserType
+
+" Lockvar and Unlockvar: {{{2
+" =====================
+syn keyword	mnvLockvar	lockv[ar]	skipwhite nextgroup=mnvLockvarBang,mnvLockvarDepth,mnvLockvarVars
+syn keyword	mnvUnlockvar	unlo[ckvar]	skipwhite nextgroup=mnvLockvarBang,mnvLockvarDepth,mnvLockvarVars
+syn match	mnvLockvarBang	contained	"\a\@1<=!"	skipwhite nextgroup=mnvLockvarVars
+syn match	mnvLockvarDepth	contained	"\<[0-3]\>"	skipwhite nextgroup=mnvLockvarVars
+syn region	mnvLockvarVars	contained
+      \ start="\h" skip=+\n\s*\%(\\\|"\\ \)\|^\s*"\\ + end="$" end="\ze[|"]"
+      \ nextgroup=mnvCmdSep,mnvComment
+      \ contains=@mnvContinue,mnvVar
+
+hi def link mnvLockvar mnvCommand
+hi def link mnvUnlockvar mnvCommand
+hi def link mnvLockvarBang mnvBang
+hi def link mnvLockvarDepth mnvNumber
+
+" For: {{{2
+" ===
+" handles MNV9 and legacy for now
+syn region	mnvFor
+      \ matchgroup=mnvCommand
+      \ start="\<for\>" end="\<in\>"
+      \ skipwhite skipnl nextgroup=@mnvForInContinue,mnv9ForInComment,@mnvExprList
+      \ contains=@mnvContinue,mnvVar,mnvVarList,mnv9Variable,mnv9VariableList
+      \ transparent
+
+syn match	mnv9ForInComment		contained	"#.*"	skipwhite skipempty nextgroup=mnvForInComment,@mnvExprList
+
+syn match	mnvForInContinue		contained	"^\s*\zs\\"	 skipwhite skipnl nextgroup=@mnvForInContinue,@mnvExprList
+syn match         mnvForInContinueComment	contained	'^\s*\zs["#]\\ .*' skipwhite skipnl nextgroup=@mnvForInContinue,@mnvExprList
+syn cluster	mnvForInContinue		contains=mnvForInContinue,mnvForInContinueComment
+
+" Abbreviations: {{{2
+" =============
+" GEN_SYN_MNV: mnvCommand abbrev, START_STR='syn keyword mnvAbb', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+syn keyword mnvAbb ab[breviate] ca[bbrev] cnorea[bbrev] cuna[bbrev] ia[bbrev] inorea[bbrev] iuna[bbrev] norea[bbrev] una[bbreviate] skipwhite nextgroup=mnvMapMod,mnvMapLhs
+" GEN_SYN_MNV: mnvCommand abclear, START_STR='syn keyword mnvAbb', END_STR='skipwhite nextgroup=mnvMapMod'
+syn keyword mnvAbb abc[lear] cabc[lear] iabc[lear] skipwhite nextgroup=mnvMapMod
+
+" Filename Patterns: {{{2
+" =================
+
+syn match	mnvWildcardQuestion	contained	"?"
+syn match	mnvWildcardStar		contained	"*"
+
+syn match	mnvWildcardBraceComma	contained	","
+syn region	mnvWildcardBrace		contained
+      \ matchgroup=mnvWildcard
+      \ start="{"
+      \ end="}"
+      \ contains=mnvWildcardEscape,mnvWildcardBrace,mnvWildcardBraceComma,mnvWildcardQuestion,mnvWildcardStar,mnvWildcardBracket
+      \ oneline
+
+syn match	mnvWildcardIntervalNumber	contained	"\d\+"
+syn match	mnvWildcardInterval	contained	"\\\\\\{\d\+\%(,\d\+\)\=\\}" contains=mnvWildcardIntervalNumber
+
+
+syn match	mnvWildcardBracket	contained	"\[\%(\^\=]\=\%(\\.\|\[\([:.=]\)[^:.=]\+\1]\|[^][:space:]]\)*\)\@>]"
+      \ contains=mnvWildcardBracketStart,mnvWildcardEscape
+
+syn match	mnvWildcardBracketCharacter	contained	"."	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketHyphen,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketRightBracket	contained	"]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketHyphen	contained	"-]\@!"	nextgroup=@mnvWildcardBracketCharacter
+syn match	mnvWildcardBracketEscape	contained	"\\."	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketHyphen,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketCharacterClass	contained	"\[:[^:]\+:]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketEquivalenceClass	contained	"\[=[^=]\+=]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+syn match	mnvWildcardBracketCollatingSymbol	contained	"\[\.[^.]\+\.]"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketEnd
+
+syn match	mnvWildcardBracketStart	contained	"\["	nextgroup=mnvWildcardBracketCaret,mnvWildcardBracketRightBracket,@mnvWildcardBracketCharacter
+syn match	mnvWildcardBracketCaret	contained	"\^"	nextgroup=@mnvWildcardBracketCharacter,mnvWildcardBracketRightBracket
+syn match	mnvWildcardBracketEnd	contained	"]"
+
+syn cluster	mnvWildcardBracketCharacter	contains=mnvWildcardBracketCharacter,mnvWildcardBracketEscape,mnvWildcardBracketCharacterClass,mnvWildcardBracketEquivalenceClass,mnvWildcardBracketCollatingSymbol
+
+syn match	mnvWildcardEscape	contained	"\\."
+
+syn cluster	mnvWildcard		contains=mnvWildcardQuestion,mnvWildcardStar,mnvWildcardBrace,mnvWildcardBracket,mnvWildcardInterval
+
+" Autocmd and Doauto{cmd,all}: {{{2
+" ===========================
+
+" TODO: explicitly match the {cmd} arg rather than bailing out to TOP
+syn region	mnvAutocmdBlock	contained	matchgroup=mnvSep start="{" end="^\s*\zs}" contains=@mnvDefBodyList
+
+syn match	mnvAutocmdGroup	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+" skipwhite nextgroup=mnvAutoEvent,mnvAutoEventGlob
+syn match	mnvAutocmdBang	contained	"\a\@1<=!"		     skipwhite nextgroup=mnvAutocmdGroup,mnvAutoEvent,mnvAutoEventGlob
+
+" TODO: cleaner handling of | in pattern position
+"     : match pattern items in addition to wildcards
+syn region	mnvAutocmdPattern	contained
+      \ start="|\@!\S"
+      \ skip="\\\\\|\\[,[:space:]]"
+      \ end="\ze[,[:space:]]"
+      \ end="$"
+      \ skipwhite nextgroup=mnvAutocmdPatternSep,mnvAutocmdMod,mnvAutocmdBlock,@mnvFunc
+      \ contains=mnvEnvvar,@mnvWildcard,mnvAutocmdPatternEscape
+syn match	mnvAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=mnvAutocmdPatternSep,mnvAutocmdMod,mnvAutocmdBlock,@mnvFunc
+" trailing pattern separator comma allowed
+syn match	mnvAutocmdPatternSep	contained	","	                skipwhite nextgroup=@mnvAutocmdPattern,mnvAutocmdMod,mnvAutocmdBlock
+syn match	mnvAutocmdPatternEscape	contained	"\\."
+syn cluster	mnvAutocmdPattern		contains=mnvAutocmdPattern,mnvAutocmdBufferPattern
+
+" TODO: MNV9 requires '++' prefix
+syn match	mnvAutocmdMod	contained	"\%(++\)\=\<nested\>" skipwhite nextgroup=mnvAutocmdMod,mnvAutocmdBlock
+syn match	mnvAutocmdMod	contained	"++once\>"	skipwhite nextgroup=mnvAutocmdMod,mnvAutocmdBlock
+
+" higher priority than mnvAutocmdGroup, assume no group is so named
+syn match	mnvAutoEventGlob	contained	"*"	skipwhite nextgroup=@mnvAutocmdPattern
+syn match	mnvAutoEventSep	contained	"\a\@1<=,"	nextgroup=mnvAutoEvent
+syn match	mnvUserAutoEventSep contained	"\a\@1<=,"	nextgroup=mnvUserAutoEvent
+
+syn match	mnvAutocmd		"\<au\%[tocmd]\>"	skipwhite nextgroup=mnvAutocmdBang,mnvAutocmdGroup,mnvAutoEvent,mnvAutoEventGlob
+
+
+syn match	mnvDoautocmdMod	contained	"<nomodeline>"		skipwhite nextgroup=mnvAutocmdGroup,mnvAutoEvent
+syn match	mnvDoautocmd		"\<do\%[autocmd]\>"	skipwhite nextgroup=mnvDoautocmdMod,mnvAutocmdGroup,mnvAutoEvent
+syn match	mnvDoautocmd		"\<doautoa\%[ll]\>"	skipwhite nextgroup=mnvDoautocmdMod,mnvAutocmdGroup,mnvAutoEvent
+
+" Echo And Execute: -- prefer strings! {{{2
+" ================
+" NOTE: No trailing comments
+
+syn region	mnvEcho
+      \ matchgroup=mnvCommand
+      \ start="\<ec\%[ho]\>"
+      \ start="\<echoe\%[rr]\>"
+      \ start="\<echom\%[sg]\>"
+      \ start="\<echoc\%[onsole]\>"
+      \ start="\<echon\>"
+      \ start="\<echow\%[indow]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment
+      \ transparent
+
+syn match	mnvEchohl	"\<echohl\=\>"	skipwhite nextgroup=mnvGroup,mnvHLGroup,mnvEchohlNone
+syn case ignore
+syn keyword	mnvEchohlNone	contained none
+syn case match
+
+syn cluster	mnvEcho	contains=mnvEcho,mnvEchohl
+
+syn region	mnvExecute
+      \ matchgroup=mnvCommand
+      \ start="\<exe\%[cute]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment
+      \ transparent
+
+syn region	mnvEval
+      \ matchgroup=mnvCommand
+      \ start="\<ev\%[al]\>"
+      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ excludenl end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,@mnvExprList,mnv9Comment,mnvComment
+      \ transparent
+
+" Filter: {{{2
+" ======
+syn match	mnvExFilter		"\<filt\%[er]\>"	skipwhite nextgroup=mnvExFilterBang,mnvExFilterPattern
+syn region	mnvExFilterPattern contained
+      \ start="[[:ident:]]"
+      \ end="\ze[[:space:]\n]"
+      \ skipwhite nextgroup=@mnvCmdList
+      \ contains=@mnvSubstList
+      \ oneline
+syn region	mnvExFilterPattern contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:ident:]|"]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvCmdList
+      \ contains=@mnvSubstList
+      \ oneline
+syn match	mnvExFilterBang	 contained	"\a\@1<=!"	skipwhite nextgroup=mnvExFilterPattern
+
+" Grep and Make: {{{2
+" =============
+" | is the command separator, escaped with \| all other backslashes are passed through literally, no tail comments
+syn match	mnvGrep		"\<l\=gr\%[ep]\>"		skipwhite nextgroup=mnvGrepBang,mnvGrepArgs,mnvCmdSep
+syn match	mnvGrepadd		"\<l\=grepa\%[dd]\>"	skipwhite nextgroup=mnvGrepBang,mnvGrepArgs,mnvCmdSep
+syn region	mnvGrepArgs	contained
+      \ start="|\@!\S"
+      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="$"
+      "\ TODO: include mnvSpecFile
+      \ contains=mnvGrepBarEscape
+syn match	mnvGrepBarEscape	contained	"\\|"
+syn match	mnvGrepBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvGrepArgs,mnvCmdSep
+
+syn match	mnvMake		"\<l\=make\=\>"		skipwhite nextgroup=mnvMakeBang,mnvMakeArgs,mnvCmdSep
+syn region	mnvMakeArgs	contained
+      \ start="|\@!\S"
+      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="$"
+      "\ TODO: include mnvSpecFile
+      \ contains=mnvMakeBarEscape
+syn match	mnvMakeBarEscape	contained	"\\|"
+syn match	mnvMakeBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvMakeArgs,mnvCmdSep
+
+" Help*: {{{2
+" =====
+syn match	mnvHelp	"\<h\%[elp]\>"	skipwhite nextgroup=mnvHelpBang,mnvHelpArg,mnvHelpNextCommand
+" TODO: match wildcards, ignoring exceptions?
+syn region	mnvHelpArg	contained
+      \ start="\S"
+      \ matchgroup=Special
+      \ end="\%(@\a\a\)\=\ze\s*\%($\|\%x0d\|\%x00\||[^|]\)"
+      \ oneline
+syn match	mnvHelpNextCommand	contained	"\ze|[^|]"	skipwhite nextgroup=mnvCmdSep
+syn match	mnvHelpBang		contained	"\a\@1<=!"	skipwhite nextgroup=mnvHelpArg,mnvHelpNextCommand
+
+syn match	mnvHelpgrep		"\<l\=helpg\%[rep]\>"	skipwhite nextgroup=mnvHelpgrepBang,mnvHelpgrepPattern
+syn region	mnvHelpgrepPattern	contained
+      \ start="\S"
+      \ matchgroup=Special
+      \ end="@\a\a\>"
+      \ end="$"
+      \ contains=@mnvSubstList
+      \ oneline
+
+" MNVgrep: {{{2
+" =======
+syn match	mnvMNVgrep		"\<l\=mnv\%[grep]\>"	skipwhite nextgroup=mnvMNVgrepBang,mnvMNVgrepPattern
+syn match	mnvMNVgrepadd		"\<l\=mnvgrepa\%[dd]\>"	skipwhite nextgroup=mnvMNVgrepBang,mnvMNVgrepPattern
+syn match	mnvMNVgrepBang	  contained	"\a\@1<=!"		skipwhite nextgroup=mnvMNVgrepPattern
+syn region	mnvMNVgrepPattern   contained
+      \ start="[[:ident:]]"
+      \ end="\ze[[:space:]\n]"
+      \ skipwhite nextgroup=mnvMNVgrepFile,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+syn region	mnvMNVgrepPattern   contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:ident:]|"]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=mnvMNVgrepFlags,mnvMNVgrepFile,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+syn match	mnvMNVgrepEscape	  contained	"\\\%(\\|\|.\)"
+syn match	mnvMNVgrepBarEscape contained	"\\|"
+syn region	mnvMNVgrepFile	  contained
+      \ start="|\@!\S"
+      \ matchgroup=mnvCmdSep
+      \ end="|"
+      \ end="\ze\s"
+      \ end="$"
+      \ skipwhite nextgroup=mnvMNVgrepFile
+      \ contains=mnvSpecFile,mnvMNVgrepEscape,mnvMNVgrepBarEscape
+syn match	mnvMNVgrepFlags	  contained	"\<[gjf]\{,3\}\>" skipwhite nextgroup=mnvMNVgrepfile
+
+" Maps: {{{2
+" ====
+" GEN_SYN_MNV: mnvCommand map, START_STR='syn keyword mnvMap', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+syn keyword mnvMap cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] om[ap] ono[remap] smap snor[emap] tma[p] tno[remap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn match	mnvMap	"\<map\>"	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+syn keyword	mnvMap	no[remap]	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+" GEN_SYN_MNV: mnvCommand mapclear, START_STR='syn keyword mnvMap', END_STR='skipwhite nextgroup=mnvMapMod'
+syn keyword mnvMap cmapc[lear] imapc[lear] lmapc[lear] nmapc[lear] omapc[lear] smapc[lear] tmapc[lear] vmapc[lear] xmapc[lear] skipwhite nextgroup=mnvMapMod
+syn keyword	mnvMap	mapc[lear]	skipwhite nextgroup=mnvMapBang,mnvMapMod
+" GEN_SYN_MNV: mnvCommand unmap, START_STR='syn keyword mnvUnmap', END_STR='skipwhite nextgroup=mnvMapMod,mnvMapLhs'
+syn keyword mnvUnmap cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] tunma[p] vu[nmap] xu[nmap] skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn keyword	mnvUnmap	unm[ap]	skipwhite nextgroup=mnvMapBang,mnvMapMod,mnvMapLhs
+
+syn match	mnvMapLhs	contained	"\%(.\|\S\)\+"		contains=mnvCtrlChar,mnvNotation,mnvMapLeader skipwhite        nextgroup=mnvMapRhs
+syn match	mnvMapLhs	contained	"\%(.\|\S\)\+\ze\s*$"	contains=mnvCtrlChar,mnvNotation,mnvMapLeader skipwhite skipnl nextgroup=mnvMapRhsContinue
+syn match	mnvMapBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn match	mnvMapMod	contained	"\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=mnvMapModKey,mnvMapModErr skipwhite nextgroup=mnvMapMod,mnvMapLhs
+syn region	mnvMapRhs	contained
+      \ start="\S"
+      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,mnvCtrlChar,mnvNotation,mnvMapLeader
+syn region	mnvMapRhsContinue	contained
+      \ start=+^\s*\%(\\\|["#]\\ \)+
+      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
+      \ end="\ze|"
+      \ end="$"
+      \ nextgroup=mnvCmdSep
+      \ contains=@mnvContinue,mnvCtrlChar,mnvNotation,mnvMapLeader
+syn match	mnvMapLeader	contained	"\%#=1\c<\%(local\)\=leader>"	contains=mnvMapLeaderKey
+syn keyword	mnvMapModKey	contained	buffer expr nowait script silent special unique
+syn case ignore
+syn keyword	mnvMapLeaderKey	contained	leader localleader
+syn case match
+
+" Menus: {{{2
+" =====
+" NOTE: tail comments disallowed
+" GEN_SYN_MNV: mnvCommand menu, START_STR='syn keyword mnvMenu', END_STR='skipwhite nextgroup=mnvMenuBang,mnvMenuMod,mnvMenuName,mnvMenuPriority,mnvMenuStatus'
+syn keyword mnvMenu am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] sme[nu] snoreme[nu] sunme[nu] tlm[enu] tln[oremenu] tlu[nmenu] tm[enu] tu[nmenu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] xme[nu] xnoreme[nu] xunme[nu] skipwhite nextgroup=mnvMenuBang,mnvMenuMod,mnvMenuName,mnvMenuPriority,mnvMenuStatus
+syn keyword mnvMenu popu[p] skipwhite nextgroup=mnvMenuBang,mnvMenuName
+syn region	mnvMenuRhs	 contained contains=@mnvContinue,mnvNotation start="|\@!\S"            skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=mnvSep end="|"
+syn region	mnvMenuRhsContinue contained contains=@mnvContinue,mnvNotation start=+^\s*\%(\\\|"\\ \)+ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=mnvSep end="|"
+syn match	mnvMenuName	"\.\@!\%(\\\s\|\S\)\+"        contained contains=mnvMenuNotation,mnvNotation skipwhite        nextgroup=mnvCmdSep,mnvMenuRhs
+syn match	mnvMenuName	"\.\@!\%(\\\s\|\S\)\+\ze\s*$" contained contains=mnvMenuNotation,mnvNotation skipwhite skipnl nextgroup=mnvCmdSep,mnvMenuRhsContinue
+syn match	mnvMenuNotation	"&\a\|&&\|\\\s\|\\\." contained
+syn match	mnvMenuPriority	"\<\d\+\%(\.\d\+\)*\>" contained skipwhite nextgroup=mnvMenuName
+syn match	mnvMenuMod	"\c<\%(script\|silent\|special\)>" contained skipwhite nextgroup=mnvMenuName,mnvMenuPriority,mnvMenuMod contains=mnvMapModKey,mnvMapModErr
+syn keyword	mnvMenuStatus	enable disable nextgroup=mnvMenuName skipwhite
+syn match	mnvMenuBang	"\a\@1<=!" contained skipwhite nextgroup=mnvMenuName,mnvMenuMod
+
+syn region	mnvMenutranslate
+      \ matchgroup=mnvCommand start="\<menut\%[ranslate]\>"
+      \ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+
+      \ end="$" matchgroup=mnvCmdSep end="|" matchgroup=mnvMenuClear end="\<clear\ze\s*\%(["#|]\|$\)"
+      \ contains=@mnvContinue,mnvMenutranslateName keepend transparent
+" oneline is sufficient to match the current formatting in runtime/lang/*.mnv
+syn match	mnvMenutranslateName "\%(\\\s\|\S\)\+" contained contains=mnvMenuNotation,mnvNotation
+syn match	mnvMenutranslateComment +".*+ contained containedin=mnvMenutranslate
+
+" If, While and Return: {{{2
+" ====================
+syn match	mnvNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@mnvExprList,mnvNotation
+syn match	mnvElse	"\<el\%[se]\>"			skipwhite nextgroup=mnvComment,mnv9Comment
+syn match	mnvEndif	"\<en\%[dif]\>"			skipwhite nextgroup=mnvComment,mnv9Comment
+
+" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
+" ======================
+syn case ignore
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}x\=\%(f\d\{1,2}\|[^ \t:]\|space\|bar\|bslash\|nl\|newline\|lf\|linefeed\|cr\|retu\%[rn]\|enter\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|csi\|right\|paste\%(start\|end\)\|left\|help\|undo\|k\=insert\|ins\|mouse\|[kz]\=home\|[kz]\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\%(page\)\=\%(\|down\|up\|k\d\>\)\)>" contains=mnvBracket
+
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(net\|dec\|jsb\|pterm\|urxvt\|sgr\)mouse>"		contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(left\|middle\|right\)\%(mouse\|drag\|release\)>"	contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}left\%(mouse\|release\)nm>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}x[12]\%(mouse\|drag\|release\)>"		contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}sgrmouserelease>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}mouse\%(up\|down\|move\)>"			contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}scrollwheel\%(up\|down\|right\|left\)>"		contains=mnvBracket
+
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(sid\|nop\|nul\|lt\|drop\)>"				contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(snr\|plug\|cursorhold\|ignore\|cmd\|scriptcmd\|focus\%(gained\|lost\)\)>"	contains=mnvBracket
+" syn match	mnvNotation	contained	'\%(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=mnvBracket
+syn match	mnvNotation	contained	'\%#=1\%(\\\|<lt>\)\=<\%([fq]-\)\=\%(line[12]\|count\|bang\|reg\|args\|mods\|lt\)>'		contains=mnvBracket skipwhite nextgroup=mnvSubst1
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([cas]file\|abuf\|amatch\|cexpr\|cword\|cWORD\|client\|stack\|script\|sf\=lnum\)>"	contains=mnvBracket
+syn match	mnvNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}char-\%(\d\+\|0\o\+\|0x\x\+\)>"		contains=mnvBracket
+
+syn match	mnvBracket contained	"[\\<>]"
+syn case match
+
+" User Command Highlighting: {{{2
+syn match mnvUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
+
+" MNV user commands
+
+" Compiler plugins
+syn match	mnvCompilerSet	"\<CompilerSet\>"	skipwhite nextgroup=mnvSetArgs
+
+" runtime/makemenu.mnv
+syn match	mnvSynMenu		"\<SynMenu\>"	skipwhite nextgroup=mnvSynMenuPath
+syn match	mnvSynMenuPath	contained	".*\ze:"	nextgroup=mnvSynMenuColon contains=mnvMenuNotation
+syn match	mnvSynMenuColon	contained	":"	nextgroup=mnvSynMenuName
+syn match	mnvSynMenuName	contained	"\w\+"
+
+" runtime/syntax/syncolor.mnv
+syn match	mnvSynColor		"\<SynColor\>"	skipwhite nextgroup=mnvSynColorGroup
+syn match	mnvSynColorGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvHiKeyList	contains=mnvGroup
+syn match	mnvSynLink		"\<SynLink\>"	skipwhite nextgroup=mnvSynLinkGroup
+syn match	mnvSynLinkGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=mnvGroup	contains=mnvGroup
+
+syn cluster mnvExUserCmdList contains=mnvCompilerSet,mnvSynColor,mnvSynLink,mnvSynMenu
+
+" Errors And Warnings: {{{2
+" ====================
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvfunctionerror")
+ syn match	mnvFunctionError	contained	"[[:space:]!]\@1<=\<[a-z0-9]\w\{-}\ze\s*("
+ syn match	mnvFunctionError	contained	"\%(<[sS][iI][dD]>\|[sg]:\)\d\w\{-}\ze\s*("
+ syn match	mnvElseIfErr	"\<else\s\+if\>"
+ syn match	mnvBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
+endif
+
+" Match: {{{2
+" =====
+syn match	mnvMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=mnvMatchGroup,mnvMatchNone contains=mnvCount
+syn match	mnvMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=mnvMatchPattern
+syn case ignore
+syn keyword	mnvMatchNone	contained	none
+syn case match
+syn region	mnvMatchPattern	contained
+      \ matchgroup=Delimiter
+      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ contains=@mnvSubstList
+      \ oneline
+
+" Normal: {{{2
+" ======
+syn match	mnvNormal		"\<norm\%[al]\>!\=" skipwhite nextgroup=mnvNormalArg contains=mnvBang
+syn region	mnvNormalArg	contained	start="\S" skip=+\n\s*\%(\\\|["#]\\ \)+ end="$" contains=@mnvContinue
+
+" Profile: {{{2
+" =======
+syn match	mnvProfileBang	 contained	"\a\@1<=!"	skipwhite nextgroup=mnvProfileArg
+syn keyword	mnvProfileArg	 contained	start	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	func	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	file	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfileArg	 contained	stop pause	skipwhite nextgroup=mnvCmdSep,@mnvComment
+syn keyword	mnvProfileArg	 contained	continue dump	skipwhite nextgroup=mnvCmdSep,@mnvComment
+" TODO: match file pattern
+syn region	mnvProfilePattern contained
+      \ start="\S"
+      \ skip=+\\[|"#]+
+      \ end="$" end=+\ze\s*[|"#]+
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+syn match	mnvProfile	"\<prof\%[ile]\>"	skipwhite nextgroup=mnvProfileBang,mnvProfileArg
+
+syn keyword	mnvProfdelArg	contained	func	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfdelArg	contained	file	skipwhite nextgroup=mnvProfilePattern
+syn keyword	mnvProfdelArg	contained	here	skipwhite nextgroup=mnvCmdSep,@mnvComment
+syn match	mnvProfdel	"\<profd\%[el]\>" skipwhite nextgroup=mnvProfdelArg
+
+" Prompt{find,repl}: {{{2
+" =================
+syn region	mnvPromptArg	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue
+syn keyword	mnvPrompt	promptf[ind] promptr[epl]	skipwhite nextgroup=mnvPromptArg
+
+" Redir: {{{2
+" =====
+syn match	mnvRedir		"\<redir\=\>"	skipwhite nextgroup=mnvRedirBang,mnvRedirFileOperator,mnvRedirVariableOperator,mnvRedirRegister,mnvRedirEnd
+syn match	mnvRedirBang	       contained	"\a\@1<=!"	skipwhite nextgroup=mnvRedirFileOperator
+
+syn match	mnvRedirFileOperator     contained	">>\="	skipwhite nextgroup=mnvRedirFile
+syn region	mnvRedirFile	       contained
+      \ start="\S"
+      \ matchgroup=Normal
+      \ end="\s*$"
+      \ end="\s*\ze[|"]"
+      \ nextgroup=mnvCmdSep,mnvComment
+      \ contains=mnvSpecFile
+syn match	mnvRedirRegisterOperator contained	">>\="
+syn match	mnvRedirRegister	       contained	"@[a-zA-Z*+"]"	nextgroup=mnvRedirRegisterOperator
+syn match	mnvRedirVariableOperator contained	"=>>\="	skipwhite nextgroup=mnvVar
+syn keyword	mnvRedirEnd	       contained	END
+
+" Sleep: {{{2
+" =====
+syn keyword	mnvSleep		sl[eep]		skipwhite nextgroup=mnvSleepBang,mnvSleepArg
+syn match	mnvSleepBang	contained	"\a\@1<=!"		skipwhite nextgroup=mnvSleepArg
+syn match	mnvSleepArg	contained	"\<\%(\d\+\)\=m\=\>"
+
+" Sort: {{{2
+" ====
+syn match	mnvSort		"\<sort\=\>"			skipwhite nextgroup=mnvSortBang,@mnvSortOptions,mnvSortPattern,mnvCmdSep
+syn match	mnvSortBang	  contained	"\a\@1<=!"			skipwhite nextgroup=@mnvSortOptions,mnvSortPattern,mnvCmdSep
+syn match	mnvSortOptionsError contained	"\a\+"
+syn match	mnvSortOptions	  contained	"\<[ilur]*[nfxob]\=[ilur]*\>"		skipwhite nextgroup=mnvSortPattern,mnvCmdSep
+syn region	mnvSortPattern	  contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:alpha:]|]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvSortOptions,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+
+syn cluster mnvSortOptions contains=mnvSortOptions,mnvSortOptionsError
+
+" Terminal: {{{2
+" ========
+syn match	mnvTerminal	"\<ter\%[minal]\>"		skipwhite        nextgroup=mnvTerminalOptions,mnvTerminalCommand
+syn match	mnvTerminal	+\<ter\%[minal]\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=mnvTerminalOptions,mnvTerminalCommand,@mnvTerminalContinue
+
+syn match	mnvTerminalContinue	contained	"^\s*\\"       	skipwhite skipnl nextgroup=@mnvTerminalContinue,mnvTerminalOptions,mnvTerminalCommand contains=mnvWhitespace
+syn match         mnvTerminalContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@mnvTerminalContinue,mnvTerminalOptions,mnvTerminalCommand contains=mnvWhitespace
+syn cluster	mnvTerminalContinue	contains=mnvTerminalContinue,mnvTerminalContinueComment
+
+syn region	mnvTerminalCommand	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvContinue
+
+syn region	mnvTerminalOptions	contained
+      \ start="++"
+      \ skip=/\s\+++\|\%(\n\|^\)\s*\%(\\\|["#]\\ \)/
+      \ end="\s"
+      \ end="$"
+      \ skipwhite nextgroup=mnvTerminalCommand
+      \ contains=@mnvContinue,mnvTerminalOption
+      \ transparent
+
+syn match	mnvTerminalOption	contained	"++\%(\%(no\)\=close\|open\|curwin\|hidden\|norestore\|shell\)\>"
+syn match	mnvTerminalOption	contained	"++kill="		nextgroup=mnvTerminalKillOptionArg
+syn match	mnvTerminalOption	contained	"++\%(rows\|cols\)="	nextgroup=mnvTerminalSizeOptionArg
+syn match	mnvTerminalOption	contained	"++eof="		nextgroup=mnvTerminalEofOptionArg
+syn match	mnvTerminalOption	contained	"++type="		nextgroup=mnvTerminalTypeOptionArg
+syn match	mnvTerminalOption	contained	"++api="		nextgroup=mnvTerminalApiOptionArg
+
+syn match	mnvTerminalApiOptionArg	contained	"\<\S\+\>"
+syn match	mnvTerminalEofOptionArg	contained	"\<\S\+\>"
+syn match	mnvTerminalSizeOptionArg	contained	"\<\d\+\>"
+syn keyword	mnvTerminalKillOptionArg	contained	term hup quit int kill
+syn match	mnvTerminalKillOptionArg	contained	"\<\d\+\>"
+syn keyword	mnvTerminalTypeOptionArg	contained	conpty winpty
+
+" Uniq: {{{2
+" ====
+syn match	mnvUniq		"\<uniq\=\>"	skipwhite nextgroup=mnvUniqBang,@mnvUniqOptions,mnvUniqPattern,mnvCmdSep
+syn match	mnvUniqBang	  contained	"\a\@1<=!"	skipwhite nextgroup=@mnvUniqOptions,mnvUniqPattern,mnvCmdSep
+syn match	mnvUniqOptionsError contained	"\a\+"
+syn match	mnvUniqOptions	  contained	"\<[ilur]*\>"	skipwhite nextgroup=mnvUniqPattern,mnvCmdSep
+syn region	mnvUniqPattern	  contained
+      \ matchgroup=Delimiter
+      \ start="\z([^[:space:][:alpha:]|]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ skipwhite nextgroup=@mnvUniqOptions,mnvCmdSep
+      \ contains=@mnvSubstList
+      \ oneline
+
+syn cluster mnvUniqOptions contains=mnvUniqOptions,mnvUniqOptionsError
+
+" Wincmd: {{{2
+" ======
+syn match	mnvWincmd	"\<winc\%[md]\>"	skipwhite nextgroup=mnvWincmdArg
+" TODO: consider extracting this list from the help file
+syn match	mnvWincmdArg	contained
+      \ "\<[sSvnqojkhlwWtbpPrRxKJHLTfFz]\>\|[\^:=\-+_<>|\]}]\|\<g\s\+[\]}]\|\<g[fFtT]\>"
+      \ skipwhite nextgroup=mnvCmdSep,mnvComment,mnv9Comment
+
+" only handles oneline assignments
+MNV9 syn match	mnvWincmd	"\s\=\<winc\%[md]\>\ze\s\+=\s*\%([#|]\|$\)"	skipwhite nextgroup=mnvWincmdArg
+
+" Syntax: {{{2
+"=======
+syn region	mnvGroupList	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      "\ need to consume the whitespace
+      \ end="\s"he=e-1
+      \ end="$"
+      \ contains=@mnvGroupListContinue,mnvGroupSpecial,mnvGroupListContinueComma
+syn keyword	mnvGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
+syn match	mnvGroupListComma		contained	","
+syn match	mnvGroupListContinueComma	contained	"\s\+,\s*\|,\s\+"	contains=mnvGroupListComma
+syn match	mnvGroupListContinueComma	contained	"\s*,\s*\%(\n\s*\%(\\\s\+\|["#]\\ .*\)\)\+"	contains=@mnvGroupListContinue,mnvGroupListComma
+
+syn match	mnvGroupListEquals	contained	"="		skipwhite skipnl nextgroup=mnvGroupListContinueStart,mnvGroupList
+" the first continuation line does not terminate the list at whitepace after \
+syn match	mnvGroupListContinueStart	contained	"^\%(\s*["#]\\ .*\n\)*\s*\\\s\+"	skipwhite        nextgroup=mnvGroupList contains=@mnvGroupListContinue transparent
+
+syn match	mnvGroupListContinue	contained	"^\s*\\"	skipwhite skipnl nextgroup=@mnvGroupListContinue,mnvGroupListContinueComma contains=mnvWhitespace
+syn match	mnvGroupListContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@mnvGroupListContinue		   contains=mnvWhitespace
+syn cluster	mnvGroupListContinue	contains=mnvGroupListContinue,mnvGroupListContinueComment
+
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynerror")
+ syn match	mnvSynError		contained	"\i\+"
+endif
+syn match	mnvSynContains		contained	"\<contains\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvSynContainedin		contained	"\<containedin\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvSynNextgroup		contained	"\<nextgroup\>"	skipwhite nextgroup=mnvGroupListEquals
+if has("conceal")
+ " no whitespace allowed after '='
+ syn match	mnvSynCchar	contained	"\<cchar="	nextgroup=mnvSynCcharValue
+ syn match	mnvSynCcharValue	contained	"\S"
+endif
+
+syn match	mnvSyntax	"\<sy\%[ntax]\>"	contains=mnvCommand skipwhite nextgroup=mnvSynType,@mnvComment
+syn cluster mnvFunctionBodyList add=mnvSyntax
+
+" Syntax: case {{{2
+syn keyword	mnvSynType	contained	case	skipwhite nextgroup=mnvSynCase,mnvSynCaseError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsyncaseerror")
+ syn match	mnvSynCaseError	contained	"\i\+"
+endif
+syn keyword	mnvSynCase	contained	ignore	match
+
+" Syntax: clear {{{2
+syn keyword	mnvSynType	contained	clear
+
+" Syntax: cluster {{{2
+syn keyword	mnvSynType	contained	cluster	skipwhite nextgroup=mnvClusterName
+syn region	mnvClusterName	contained keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="$\||" contains=@mnvContinue,mnvGroupAdd,mnvGroupRem,mnvSynContains,mnvSynError
+syn match	mnvGroupAdd	contained	"\<add\>"	skipwhite nextgroup=mnvGroupListEquals
+syn match	mnvGroupRem	contained	"\<remove\>"	skipwhite nextgroup=mnvGroupListEquals
+
+" Syntax: conceal {{{2
+syn match	mnvSynType	contained	"\<conceal\>"	skipwhite nextgroup=mnvSynConceal,mnvSynConcealError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynconcealerror")
+ syn match	mnvSynConcealError contained	"\i\+"
+endif
+syn keyword	mnvSynConceal	contained	on	off
+
+" Syntax: foldlevel {{{2
+syn keyword	mnvSynType	contained	foldlevel	skipwhite nextgroup=mnvSynFoldlevel,mnvSynFoldlevelError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynfoldlevelerror")
+ syn match	mnvSynFoldlevelError	contained	"\i\+"
+endif
+syn keyword	mnvSynFoldlevel	contained	start	minimum
+
+" Syntax: iskeyword {{{2
+syn keyword	mnvSynType		contained	iskeyword	skipwhite nextgroup=mnvSynIskeyword
+syn keyword	mnvSynIskeyword		contained	clear
+syn match	mnvSynIskeyword		contained	"\S\+"	contains=mnvSynIskeywordSep
+syn match	mnvSynIskeywordSep	contained	","
+
+" Syntax: include {{{2
+syn keyword	mnvSynType		contained	include	skipwhite nextgroup=mnvSynIncludeCluster
+syn match	mnvSynIncludeCluster	contained	"@[_a-zA-Z0-9]\+\>"
+
+" Syntax: keyword {{{2
+syn cluster	mnvSynKeyGroup	contains=@mnvContinue,mnvSynCchar,mnvSynNextgroup,mnvSynKeyOpt,mnvSynContainedin
+syn keyword	mnvSynType	contained	keyword	skipwhite nextgroup=mnvSynKeyRegion
+syn region	mnvSynKeyRegion	contained         keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynKeyGroup
+syn match	mnvSynKeyOpt	contained	"\%#=1\<\%(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
+
+" Syntax: match {{{2
+syn cluster	mnvSynMtchGroup	contains=@mnvContinue,mnvSynCchar,mnvSynContains,mnvSynContainedin,mnvSynError,mnvSynMtchOpt,mnvSynNextgroup,mnvSynRegPat,mnvNotation,mnvMtchComment
+syn keyword	mnvSynType	contained	match	skipwhite nextgroup=mnvSynMatchRegion
+syn region	mnvSynMatchRegion	contained keepend	matchgroup=mnvGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynMtchGroup
+syn match	mnvSynMtchOpt	contained	"\%#=1\<\%(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
+
+" Syntax: off and on {{{2
+syn keyword	mnvSynType	contained	enable	list	manual	off	on	reset
+
+" Syntax: region {{{2
+syn cluster	mnvSynRegPatGroup	contains=@mnvContinue,mnvPatSep,mnvNotPatSep,mnvSynPatRange,mnvSynNotPatRange,mnvSubstSubstr,mnvPatRegion,mnvPatSepErr,mnvNotation
+syn cluster	mnvSynRegGroup	contains=@mnvContinue,mnvSynCchar,mnvSynContains,mnvSynContainedin,mnvSynNextgroup,mnvSynRegOpt,mnvSynReg,mnvSynMtchGrp
+syn keyword	mnvSynType	contained	region	skipwhite nextgroup=mnvSynRegion
+syn region	mnvSynRegion	contained keepend	matchgroup=mnvGroupName start="\h\w*" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=@mnvSynRegGroup
+syn match	mnvSynRegOpt	contained	"\%#=1\<\%(conceal\%(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
+syn match	mnvSynReg	contained	"\<\%(start\|skip\|end\)="	nextgroup=mnvSynRegPat
+syn match	mnvSynMtchGrp	contained	"matchgroup="	nextgroup=mnvGroup,mnvHLGroup
+syn region	mnvSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip=/\\\\\|\\\z1\|\n\s*\%(\\\|"\\ \)/  end="\z1"  contains=@mnvSynRegPatGroup skipwhite nextgroup=mnvSynPatMod,mnvSynReg
+syn match	mnvSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\="
+syn match	mnvSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\=," nextgroup=mnvSynPatMod
+syn match	mnvSynPatMod	contained	"lc=\d\+"
+syn match	mnvSynPatMod	contained	"lc=\d\+," nextgroup=mnvSynPatMod
+syn region	mnvSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
+syn match	mnvSynNotPatRange	contained	"\\\\\|\\\["
+syn match	mnvMtchComment	contained	'"[^"]\+$'
+
+" Syntax: spell {{{2
+syn keyword	mnvSynType	contained	spell	skipwhite nextgroup=mnvSynSpell,mnvSynSpellError
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsynspellerror")
+ syn match	mnvSynSpellError contained	"\i\+"
+endif
+syn keyword	mnvSynSpell	contained	default	notoplevel	toplevel
+
+" Syntax: sync {{{2
+" ============
+syn keyword mnvSynType	contained	sync	skipwhite	nextgroup=mnvSyncClear,mnvSyncMatch,mnvSyncError,mnvSyncRegion,mnvSyncArgs
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvsyncerror")
+ syn match	mnvSyncError	contained	"\i\+"
+endif
+
+syn region	mnvSyncArgs	contained	start="\S" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|\|$" contains=mnvSyncLines,mnvSyncLinebreak,mnvSyncLinecont,mnvSyncFromstart,mnvSyncCcomment
+
+syn keyword	mnvSyncCcomment	contained	ccomment	skipwhite	nextgroup=mnvGroupName
+syn keyword	mnvSyncClear	contained	clear	skipwhite	nextgroup=mnvSyncGroupName
+syn keyword	mnvSyncFromstart	contained	fromstart
+syn keyword	mnvSyncMatch	contained	match	skipwhite	nextgroup=mnvSyncGroupName
+syn keyword	mnvSyncRegion	contained	region	skipwhite	nextgroup=mnvSynRegion
+syn match	mnvSyncLinebreak	contained	"\<linebreaks="		nextgroup=mnvNumber
+syn keyword	mnvSyncLinecont	contained	linecont	skipwhite	nextgroup=mnvSynRegPat
+syn match	mnvSyncLines	contained	"\<lines="		nextgroup=mnvNumber
+syn match	mnvSyncLines	contained	"\<minlines="		nextgroup=mnvNumber
+syn match	mnvSyncLines	contained	"\<maxlines="		nextgroup=mnvNumber
+syn match	mnvSyncGroupName	contained	"\<\h\w*\>"	skipwhite	nextgroup=mnvSyncKey
+syn match	mnvSyncKey	contained	"\<grouphere\>"	skipwhite	nextgroup=mnvSyncGroup
+syn match	mnvSyncKey	contained	"\<groupthere\>"	skipwhite	nextgroup=mnvSyncGroup
+syn match	mnvSyncGroup	contained	"\<\h\w*\>"	skipwhite	nextgroup=mnvSynRegPat,mnvSyncNone
+syn keyword	mnvSyncNone	contained	NONE
+
+" Syntime: {{{2
+" =======
+syn keyword	mnvSyntimeArg	contained	on off clear report	skipwhite nextgroup=mnvComment,mnv9Comment,mnvCmdSep
+syn keyword	mnvSyntime		synti[me]		skipwhite nextgroup=mnvSyntimeArg
+" Additional IsCommand: here by reasons of precedence {{{2
+" ====================
+syn match	mnvIsCommand	"<Bar>\s*\a\+"	transparent contains=mnvCommand,mnvNotation
+
+" Highlighting: {{{2
+" ============
+syn cluster	mnvHighlightCluster		contains=mnvHiLink,mnvHiClear,mnvHiKeyList,@mnvComment
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_nomnvhictermerror")
+ syn match	mnvHiCtermError	contained	"\D\i*"
+endif
+syn match	mnvHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=mnvHiBang,@mnvHighlightCluster
+syn match	mnvHiBang	contained	"\a\@1<=!"	skipwhite nextgroup=@mnvHighlightCluster
+
+syn case ignore
+" Conceal is a generated low-priority match
+syn match	mnvHiGroup	contained	"\%(\<Conceal\>\)\@!\i\+"
+syn keyword	mnvHiNone	contained	NONE
+syn keyword	mnvHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl underdashed underdotted underdouble
+syn keyword	mnvFgBgAttrib	contained	none bg background fg foreground
+syn case match
+syn match	mnvHiAttribList	contained	"\i\+"	contains=mnvHiAttrib
+syn match	mnvHiAttribList	contained	"\i\+,"he=e-1	contains=mnvHiAttrib nextgroup=mnvHiAttribList
+syn case ignore
+syn keyword	mnvHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey grey40 grey50 grey90 lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred lightyellow magenta red seagreen white yellow
+syn match	mnvHiCtermColor	contained	"\<color\d\{1,3}\>"
+syn case match
+
+syn match	mnvHiFontname	contained	"[a-zA-Z\-*]\+"
+syn match	mnvHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
+syn match	mnvHiGuiRgb	contained	"#\x\{6}"
+
+" Highlighting: hi group key=arg ... {{{2
+syn cluster	mnvHiCluster contains=mnvGroup,mnvHLGroup,mnvHiGroup,mnvHiNone,mnvHiTerm,mnvHiCTerm,mnvHiStartStop,mnvHiCtermFgBg,mnvHiCtermul,mnvHiCtermfont,mnvHiGui,mnvHiGuiFont,mnvHiGuiFgBg,mnvHiKeyError,mnvNotation,mnvComment,mnv9comment
+syn region	mnvHiKeyList	contained 	start="\i\+" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|" excludenl end="$" contains=@mnvContinue,@mnvHiCluster
+if !exists("g:mnvsyn_noerror") && !exists("g:mnvsyn_mnvhikeyerror")
+ syn match	mnvHiKeyError	contained	"\i\+="he=e-1
+endif
+syn match	mnvHiTerm	contained	"\cterm="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiStartStop	contained	"\c\%(start\|stop\)="he=e-1	nextgroup=mnvHiTermcap,mnvOption
+syn match	mnvHiCTerm	contained	"\ccterm="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiCtermul	contained	"\cctermul="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiCtermfont	contained	"\cctermfont="he=e-1	nextgroup=mnvHiNmbr,mnvHiCtermColor,mnvFgBgAttrib,mnvHiCtermError
+syn match	mnvHiGui	contained	"\cgui="he=e-1		nextgroup=mnvHiAttribList
+syn match	mnvHiGuiFont	contained	"\cfont="he=e-1		nextgroup=mnvHiFontname
+syn match	mnvHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=mnvHiGroup,mnvHiGuiFontname,mnvHiGuiRgb,mnvFgBgAttrib
+syn match	mnvHiTermcap	contained	"\S\+"		contains=mnvNotation
+syn match	mnvHiNmbr	contained	'\d\+'
+
+" Highlight: clear {{{2
+syn keyword	mnvHiClear	contained	clear	skipwhite nextgroup=mnvGroup,mnvHLGroup,mnvHiGroup
+
+" Highlight: link {{{2
+" see tst24 (hi def vs hi) (Jul 06, 2018)
+"syn region	mnvHiLink	contained oneline matchgroup=mnvCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=mnvHiGroup,mnvGroup,mnvHLGroup,mnvNotation
+" TODO: simplify and allow line continuations --djk
+syn region	mnvHiLink	contained matchgroup=Type start="\%(\<hi\%[ghlight]!\=\s\+\)\@<=\%(\%(def\%[ault]\s\+\)\=link\>\|\<def\%[ault]\>\)" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=mnvCmdSep end="|" excludenl end="$" contains=@mnvContinue,@mnvHiCluster
+
+" Control Characters: {{{2
+" ==================
+syn match	mnvCtrlChar	"[
--]"
+
+" Embedded Scripts:  {{{2
+" ================
+"   perl,ruby	: Benoit Cerrina
+"   python,tcl	: Johannes Zellner
+"   mzscheme, lua : Charles Campbell
+
+" Allows users to specify the type of embedded script highlighting
+" they want:  (lua/mzscheme/perl/python/ruby/tcl support)
+"   g:mnvsyn_embed == 0   : don't embed any scripts
+"   g:mnvsyn_embed =~# 'l' : embed Lua
+"   g:mnvsyn_embed =~# 'm' : embed MzScheme
+"   g:mnvsyn_embed =~# 'p' : embed Perl
+"   g:mnvsyn_embed =~# 'P' : embed Python
+"   g:mnvsyn_embed =~# 'r' : embed Ruby
+"   g:mnvsyn_embed =~# 't' : embed Tcl
+
+let s:interfaces = get(g:, "mnvsyn_embed", "lP")
+
+" [-- lua --] {{{3
+if s:interfaces =~# 'l'
+  syn include @mnvLuaScript syntax/lua.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvLua	lua	skipwhite nextgroup=mnvLuaHeredoc,mnvLuaStatement
+syn keyword	mnvLua	luado	skipwhite nextgroup=mnvLuaStatement
+syn keyword	mnvLua	luafile
+
+syn region	mnvLuaStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvLuaScript,@mnvContinue
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvLuaScript
+MNVFoldl syn region mnvLuaHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvLuaScript
+
+" [-- mzscheme --] {{{3
+if s:interfaces =~# 'm'
+  let s:iskKeep = &l:isk
+  syn include @mnvMzSchemeScript syntax/scheme.mnv
+  unlet b:current_syntax
+  let &l:isk = s:iskKeep
+endif
+
+syn keyword	mnvMzScheme	mz[scheme]	skipwhite nextgroup=mnvMzSchemeHeredoc,mnvMzSchemeStatement
+syn keyword	mnvMzScheme	mzf[ile]
+
+syn region	mnvMzSchemeStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvMzSchemeScript,@mnvContinue
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvMzSchemeScript
+MNVFoldm syn region mnvMzSchemeHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvMzSchemeScript
+
+" [-- perl --] {{{3
+if s:interfaces =~# 'p'
+  syn include @mnvPerlScript syntax/perl.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPerl	pe[rl]	skipwhite nextgroup=mnvPerlHeredoc,mnvPerlStatement
+syn keyword	mnvPerl	perld[o]	skipwhite nextgroup=mnvPerlStatement
+
+syn region	mnvPerlStatement	contained
+       \ start="\S"
+       \ skip=+\n\s*\%(\\\|["#]\\ \)+
+       \ end="$"
+       \ contains=@mnvPerlScript,@mnvContinue
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+<<\s*\z(\S\+\)\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1$+ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+<<\ze\s*$+	matchgroup=mnvScriptHeredocStop
+       \ end=+^\.$+
+       \ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1\=\z2$+
+       \ contains=@mnvPerlScript
+MNVFoldp syn region mnvPerlHeredoc	contained
+       \ matchgroup=mnvScriptHeredocStart
+       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+       \ matchgroup=mnvScriptHeredocStop
+       \ end=+^\z1\=\.$+
+       \ contains=@mnvPerlScript
+
+" [-- python --] {{{3
+if s:interfaces =~# 'P'
+  syn include @mnvPythonScript syntax/python2.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPython	py[thon]	skipwhite nextgroup=mnvPythonHeredoc,mnvPythonStatement
+syn keyword	mnvPython	pydo	skipwhite nextgroup=mnvPythonStatement
+syn keyword	mnvPython	pyfile
+
+syn region	mnvPythonStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPythonScript,@mnvContinue
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPythonScript
+MNVFoldP syn region mnvPythonHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPythonScript
+
+" [-- python3 --] {{{3
+if s:interfaces =~# 'P'
+  syn include @mnvPython3Script syntax/python.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvPython3	python3 py3	skipwhite nextgroup=mnvPython3Heredoc,mnvPython3Statement
+syn keyword	mnvPython3	py3do	skipwhite nextgroup=mnvPython3Statement
+syn keyword	mnvPython3	py3file
+
+syn region	mnvPython3Statement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPython3Script,@mnvContinue
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPython3Script
+MNVFoldP syn region mnvPython3Heredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPython3Script
+
+" [-- pythonx --] {{{3
+if s:interfaces =~# 'P'
+  if &pyxversion == 2
+    syn cluster mnvPythonXScript contains=@mnvPythonScript
+  else
+    syn cluster mnvPythonXScript contains=@mnvPython3Script
+  endif
+endif
+
+syn keyword	mnvPythonX	pythonx pyx	skipwhite nextgroup=mnvPythonXHeredoc,mnvPythonXStatement
+syn keyword	mnvPythonX	pyxdo	skipwhite nextgroup=mnvPythonXStatement
+syn keyword	mnvPythonX	pyxfile
+
+syn region	mnvPythonXStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvPythonXScript,@mnvContinue
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvPythonXScript
+MNVFoldP syn region mnvPythonXHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvPythonXScript
+
+" [-- ruby --] {{{3
+if s:interfaces =~# 'r'
+  syn include @mnvRubyScript syntax/ruby.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvRuby	rub[y]	skipwhite nextgroup=mnvRubyHeredoc,mnvRubyStatement
+syn keyword	mnvRuby	rubyd[o]	skipwhite nextgroup=mnvRubyStatement
+syn keyword	mnvRuby	rubyf[ile]
+
+syn region	mnvRubyStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvRubyScript,@mnvContinue
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+	matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvRubyScript
+MNVFoldr syn region mnvRubyHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\.$+
+      \ contains=@mnvRubyScript
+
+" [-- tcl --] {{{3
+if s:interfaces =~# 't'
+  syn include @mnvTclScript syntax/tcl.mnv
+  unlet b:current_syntax
+endif
+
+syn keyword	mnvTcl	tcl	skipwhite nextgroup=mnvTclHeredoc,mnvTclStatement
+syn keyword	mnvTcl	tcld[o]	skipwhite nextgroup=mnvTclStatement
+syn keyword	mnvTcl	tclf[ile]
+syn region	mnvTclStatement	contained
+      \ start="\S"
+      \ skip=+\n\s*\%(\\\|["#]\\ \)+
+      \ end="$"
+      \ contains=@mnvTclScript,@mnvContinue
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\s*\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+<<\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\.$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\z2$+
+      \ contains=@mnvTclScript
+MNVFoldt syn region mnvTclHeredoc	contained
+      \ matchgroup=mnvScriptHeredocStart
+      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
+      \ matchgroup=mnvScriptHeredocStop
+      \ end=+^\z1\=\.$+
+      \ contains=@mnvTclScript
+
+unlet s:interfaces
+" Function Call Highlighting: {{{2
+" (following Gautam Iyer's suggestion)
+" ==========================
+syn match	mnvFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=mnvOperParen		contains=mnvFuncName
+syn match	mnvUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=mnvOperParen,mnv9TypeArgs
+syn match	mnvUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnv9MethodName,mnv9Super,mnv9This
+syn match	mnvUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=mnvOperParen		contains=mnvVarScope
+syn match	mnvUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnvVarScope,mnvNotation
+
+MNV9 syn match	mnv9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=mnvOperParen,mnv9TypeArgs	contains=mnvVarScope,mnvNotation,mnv9MethodName,mnv9Super,mnv9This
+MNV9 syn match	mnv9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=mnvOperParen		contains=mnvFuncName
+
+syn cluster	mnvFunc	contains=mnvFunc,mnvUserFunc
+syn cluster	mnv9Func	contains=mnv9Func,mnv9UserFunc
+
+syn region	mnv9TypeArgs	contained
+      \ matchgroup=Delimiter
+      \ start="<\ze\a"
+      \ end=">"
+      \ nextgroup=mnvOperParen
+      \ contains=@mnvType
+      \ oneline
+
+" Beginners - Patterns that involve ^ {{{2
+" =========
+MNV9 syn region	mnv9LineComment	start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\%(\\\|#\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString,mnv9CommentTitle extend
+MNVL syn region	mnvLineComment	start=+^[ \t:]*\zs".*$+ skip=+\n\s*\%(\\\|"\\ \)+ end="$" contains=@mnvCommentGroup,mnvCommentString,mnvCommentTitle extend
+
+syn match	mnvCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=mnvCommentTitleLeader,mnvTodo,@mnvCommentGroup
+syn match	mnv9CommentTitle	'#\s*\%([sS]:\|\h\w*#\)\=\%([A-DF-Z]\w*\|E\%(\d\{1,4}\>\)\@!\w*\)\(\s\+\u\w*\)*:'hs=s+1	contained contains=mnv9CommentTitleLeader,mnvTodo,@mnvCommentGroup
+
+" allowed anywhere in the file
+if !s:mnv9script
+  syn match	mnvShebangError	"^\s*\zs#!.*" display
+endif
+syn match	mnvShebang	"\%^#!.*" display
+
+syn match	mnvContinue		"^\s*\zs\\"
+syn match	mnvContinueComment	'^\s*\zs["#]\\ .*' extend
+syn match	mnv9ContinueComment	"^\s*\zs#\\ .*"	 extend
+syn cluster	mnvContinue	contains=mnvContinue,mnvContinueComment
+syn cluster	mnv9Continue	contains=mnvContinue,mnv9ContinueComment
+
+syn region	mnvString	start='^\s*\\"' end='"' oneline keepend contains=@mnvStringGroup,mnvContinue
+syn region	mnvString	start="^\s*\\'" end="'" oneline keepend contains=mnvQuoteEscape,mnvContinue
+
+syn match	mnvCommentTitleLeader	'"\s\+'ms=s+1	contained
+syn match	mnv9CommentTitleLeader	'#\s\+'ms=s+1	contained
+
+" Searches And Globals: {{{2
+" ====================
+MNVL syn match	mnvSearch	'^\s*[/?].*'		contains=mnvSearchDelim
+syn match	mnvSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
+MNV9 syn match	mnv9Search	'^\s*:[/?].*'		contains=mnv9SearchDelim
+syn match	mnv9SearchDelim	'^\s*\zs:[/?]\|[/?]$'	contained contains=mnvCmdSep
+syn region	mnvGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=mnvSubst1
+syn region	mnvGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=mnvSubst1
+
+" MNV9 script Regions: {{{2
+" ==================
+
+if s:mnv9script
+  syn cluster mnvLegacyTop	contains=TOP,mnv9LegacyHeader,mnv9Comment,mnv9LineComment
+  MNVFoldH syn region mnv9LegacyHeader start="\%^" end="^\ze\s*mnv9s\%[cript]\>" contains=@mnvLegacyTop,mnvComment,mnvLineComment
+
+  syn keyword mnv9MNV9ScriptArg	noclear contained
+  syn keyword mnv9MNV9Script	mnv9s[cript] nextgroup=mnv9MNV9ScriptArg skipwhite
+endif
+
+" Synchronize (speed) {{{2
+"============
+
+exe "syn sync minlines=" .. get(g:, "mnvsyn_minlines", 100)
+exe "syn sync maxlines=" .. get(g:, "mnvsyn_maxlines", 200)
+
+syn sync linecont	"^\s\+\\"
+syn sync linebreaks=2
+syn sync match mnvAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
+
+" ====================
+" Highlighting Settings {{{2
+" ====================
+
+if !exists("skip_mnv_syntax_inits")
+ if !exists("g:mnvsyn_noerror")
+  hi def link mnvBehaveError	mnvError
+  hi def link mnvCollClassErr	mnvError
+  hi def link mnvErrSetting	mnvError
+  hi def link mnvFTError	mnvError
+  hi def link mnvFunctionError	mnvError
+  hi def link mnvFunc         	mnvError
+  hi def link mnv9Func         	mnvError
+  hi def link mnvHiAttribList	mnvError
+  hi def link mnvHiCtermError	mnvError
+  hi def link mnvHiKeyError	mnvError
+  hi def link mnvMapModErr	mnvError
+  hi def link mnvMarkArgError	mnvError
+  hi def link mnvShebangError	mnvError
+  hi def link mnvSortOptionsError	Error
+  hi def link mnvSubstFlagErr	mnvError
+  hi def link mnvSynCaseError	mnvError
+  hi def link mnvSyncError	mnvError
+  hi def link mnvSynConcealError	mnvError
+  hi def link mnvSynError	mnvError
+  hi def link mnvSynFoldlevelError	mnvError
+  hi def link mnvSynIskeywordError	mnvError
+  hi def link mnvSynSpellError	mnvError
+  hi def link mnvBufnrWarn	mnvWarn
+
+  hi def link mnv9TypeAliasError	mnvError
+ endif
+
+ hi def link mnvAbb	mnvCommand
+ hi def link mnvAddress	mnvMark
+ hi def link mnvAt	mnvCommand
+ hi def link mnvAtArg	Special
+ hi def link mnvAugroupBang	mnvBang
+ hi def link mnvAugroupError	mnvError
+ hi def link mnvAugroupKey	mnvCommand
+ hi def link mnvAutocmd	mnvCommand
+ hi def link mnvAutocmdBang	mnvBang
+ hi def link mnvAutocmdPatternEscape	Special
+ hi def link mnvAutoEvent	Type
+ hi def link mnvAutoEventGlob	Type
+ hi def link mnvAutocmdBufferPattern	Special
+ hi def link mnvAutocmdMod	Special
+ hi def link mnvAutocmdPatternSep	mnvSep
+ hi def link mnvBang	mnvOper
+ hi def link mnvBehaveBang	mnvBang
+ hi def link mnvBehaveModel	mnvBehave
+ hi def link mnvBehave	mnvCommand
+ hi def link mnvBracket	Delimiter
+ hi def link mnvBreakaddFunc	Special
+ hi def link mnvBreakaddFile	Special
+ hi def link mnvBreakaddHere	Special
+ hi def link mnvBreakaddExpr	Special
+ hi def link mnvBreakpointGlob	Special
+ hi def link mnvBreakadd	mnvCommand
+ hi def link mnvBreakdel	mnvCommand
+ hi def link mnvBreaklist	mnvCommand
+ hi def link mnvCall	mnvCommand
+ hi def link mnvCatch	mnvCommand
+ hi def link mnvCd	mnvCommand
+ hi def link mnvCdBang	mnvBang
+ hi def link mnvCmplxRepeat	SpecialChar
+ hi def link mnvCommand	Statement
+ hi def link mnvCommandModifier	mnvCommand
+ hi def link mnvCommandModifierBang	mnvBang
+ hi def link mnvComment	Comment
+ hi def link mnvCommentError	mnvError
+ hi def link mnvCommentString	mnvString
+ hi def link mnvCommentTitle	PreProc
+ hi def link mnvCondHL	mnvCommand
+ hi def link mnvConst	mnvCommand
+ hi def link mnvContinue	Special
+ hi def link mnvContinueComment	mnvComment
+ hi def link mnvContinueString	mnvString
+ hi def link mnvCount	Number
+ hi def link mnvCtrlChar	SpecialChar
+ hi def link mnvDebug	mnvCommand
+ hi def link mnvDebuggreedy	mnvCommand
+ hi def link mnvDef	mnvCommand
+ hi def link mnvDefBang	mnvBang
+ hi def link mnvDefComment	mnv9Comment
+ hi def link mnvDefer	mnvCommand
+ hi def link mnvDefParam	mnvVar
+ hi def link mnvDelcommand	mnvCommand
+ hi def link mnvDelcommandAttr	mnvUserCmdAttr
+ hi def link mnvDelfunction	mnvCommand
+ hi def link mnvDelfunctionBang	mnvBang
+ hi def link mnvDoautocmd	mnvCommand
+ hi def link mnvDoautocmdMod	Special
+ hi def link mnvDoCommand	mnvCommand
+ hi def link mnvDoCommandBang	mnvBang
+ hi def link mnvEcho	mnvCommand
+ hi def link mnvEchohlNone	mnvGroup
+ hi def link mnvEchohl	mnvCommand
+ hi def link mnvElse	mnvCommand
+ hi def link mnvElseIfErr	Error
+ hi def link mnvEndfunction	mnvCommand
+ hi def link mnvEnddef	mnvCommand
+ hi def link mnvEndif	mnvCommand
+ hi def link mnvEnvvar	PreProc
+ hi def link mnvError	Error
+ hi def link mnvEscape	Special
+ hi def link mnvEval	mnvCommand
+ hi def link mnvExFilter	mnvCommand
+ hi def link mnvExFilterBang	mnvBang
+ hi def link mnvExMark	mnvCommand
+ hi def link mnvFBVar	mnvVar
+ hi def link mnvFgBgAttrib	mnvHiAttrib
+ hi def link mnvFuncEcho	mnvCommand
+ hi def link mnvFor	mnvCommand
+ hi def link mnvForInContinue	mnvContinue
+ hi def link mnvForInContinueComment	mnvContinueComment
+ hi def link mnvFTCmd	mnvCommand
+ hi def link mnvFTOption	mnvSynType
+ hi def link mnvFunction	mnvCommand
+ hi def link mnvFunctionBang	mnvBang
+ hi def link mnvFunctionComment	mnvComment
+ hi def link mnvFuncName	Function
+ hi def link mnvFunctionMod	Special
+ hi def link mnvFunctionParam	mnvVar
+ hi def link mnvFunctionParamEquals	mnvOper
+ hi def link mnvFunctionScope	mnvVarScope
+ hi def link mnvFunctionSID	mnvNotation
+ hi def link mnvGrep	mnvCommand
+ hi def link mnvGrepadd	mnvCommand
+ hi def link mnvGrepBang	mnvBang
+ hi def link mnvGroup	Type
+ hi def link mnvGroupAdd	mnvSynOption
+ hi def link mnvGroupListEquals	mnvSynOption
+ hi def link mnvGroupListContinue		mnvContinue
+ hi def link mnvGroupListContinueComment	mnvContinueComment
+ hi def link mnvGroupName	Normal
+ hi def link mnvGroupRem	mnvSynOption
+ hi def link mnvGroupSpecial	Special
+ hi def link mnvHelp	mnvCommand
+ hi def link mnvHelpBang	mnvBang
+ hi def link mnvHelpgrep	mnvCommand
+ hi def link mnvHiAttrib	PreProc
+ hi def link mnvHiBang	mnvBang
+ hi def link mnvHiClear	Type
+ hi def link mnvHiCtermColor	Constant
+ hi def link mnvHiCtermFgBg	mnvHiTerm
+ hi def link mnvHiCtermfont	mnvHiTerm
+ hi def link mnvHiCtermul	mnvHiTerm
+ hi def link mnvHiCTerm	mnvHiTerm
+ hi def link mnvHighlight	mnvCommand
+ hi def link mnvHiGroup	mnvGroupName
+ hi def link mnvHiGuiFgBg	mnvHiTerm
+ hi def link mnvHiGuiFont	mnvHiTerm
+ hi def link mnvHiGuiRgb	mnvNumber
+ hi def link mnvHiGui	mnvHiTerm
+ hi def link mnvHiNmbr	Number
+ hi def link mnvHiNone	mnvGroup
+ hi def link mnvHiStartStop	mnvHiTerm
+ hi def link mnvHiTerm	Type
+ hi def link mnvHLGroup	mnvGroup
+ hi def link mnvHistory	mnvCommand
+ hi def link mnvHistoryName	Special
+ hi def link mnvImport	mnvCommand
+ hi def link mnvImportAutoload	Special
+ hi def link mnvImportAs	mnvImport
+ hi def link mnvInsert	mnvString
+ hi def link mnv9KeymapLineComment	mnvKeymapLineComment
+ hi def link mnvKeymapLineComment	mnvComment
+ hi def link mnvKeymapTailComment	mnvComment
+ hi def link mnvLambdaBrace	Delimiter
+ hi def link mnvLambdaOperator	mnvOper
+ hi def link mnvLanguage	mnvCommand
+ hi def link mnvLanguageCategory	Special
+ hi def link mnvLanguageNameReserved	Constant
+ hi def link mnvLet	mnvCommand
+ hi def link mnvLetHeredoc	mnvString
+ hi def link mnvLetHeredocStart	Special
+ hi def link mnvLetHeredocStop	Special
+ hi def link mnvLetRegister	mnvRegister
+ hi def link mnvLineComment	mnvComment
+ hi def link mnvLua	mnvCommand
+ hi def link mnvMake	mnvCommand
+ hi def link mnvMakeadd	mnvCommand
+ hi def link mnvMakeBang	mnvBang
+ hi def link mnvMapBang	mnvBang
+ hi def link mnvMapLeader	mnvBracket
+ hi def link mnvMapLeaderKey	mnvNotation
+ hi def link mnvMapModKey	mnvFunctionSID
+ hi def link mnvMapMod	mnvBracket
+ hi def link mnvMap	mnvCommand
+ hi def link mnvMark	Number
+ hi def link mnvMarkNumber	mnvNumber
+ hi def link mnvMatch	mnvCommand
+ hi def link mnvMatchGroup	mnvGroup
+ hi def link mnvMatchNone	mnvGroup
+ hi def link mnvMenuBang	mnvBang
+ hi def link mnvMenuClear	Special
+ hi def link mnvMenuMod	mnvMapMod
+ hi def link mnvMenuName	PreProc
+ hi def link mnvMenu	mnvCommand
+ hi def link mnvMenuNotation	mnvNotation
+ hi def link mnvMenuPriority	Number
+ hi def link mnvMenuStatus	Special
+ hi def link mnvMenutranslateComment	mnvComment
+ hi def link mnv9MethodName	mnvFuncName
+ hi def link mnvMtchComment	mnvComment
+ hi def link mnvMzScheme	mnvCommand
+ hi def link mnvNonText	NonText
+ hi def link mnvNormal	mnvCommand
+ hi def link mnvNotation	Special
+ hi def link mnvNotFunc	mnvCommand
+ hi def link mnvNotPatSep	mnvString
+ hi def link mnvNumber	Number
+ hi def link mnvOperError	Error
+ hi def link mnvOper	Operator
+ hi def link mnvOperContinue	mnvContinue
+ hi def link mnvOperContinueComment	mnvContinueComment
+ hi def link mnvOption	PreProc
+ hi def link mnvOptionVar	Identifier
+ hi def link mnvOptionVarName	Identifier
+ hi def link mnvParenSep	Delimiter
+ hi def link mnvPatSepErr	mnvError
+ hi def link mnvPatSepR	mnvPatSep
+ hi def link mnvPatSep	SpecialChar
+ hi def link mnvPatSepZone	mnvString
+ hi def link mnvPatSepZ	mnvPatSep
+ hi def link mnvPattern	Type
+ hi def link mnvPerl	mnvCommand
+ hi def link mnvPlainMark	mnvMark
+ hi def link mnvProfile	mnvCommand
+ hi def link mnvProfileArg	mnvSpecial
+ hi def link mnvProfileBang	mnvBang
+ hi def link mnvProfdel	mnvCommand
+ hi def link mnvProfdelArg	mnvSpecial
+ hi def link mnvPrompt	mnvCommand
+ hi def link mnvPython	mnvCommand
+ hi def link mnvPython3	mnvCommand
+ hi def link mnvPythonX	mnvCommand
+ hi def link mnvQuoteEscape	mnvEscape
+ hi def link mnvRedir	mnvCommand
+ hi def link mnvRedirBang	mnvBang
+ hi def link mnvRedirFileOperator	mnvOper
+ hi def link mnvRedirRegisterOperator	mnvOper
+ hi def link mnvRedirVariableOperator	mnvOper
+ hi def link mnvRedirEnd	Special
+ hi def link mnvRedirRegister	mnvRegister
+ hi def link mnvRegister	SpecialChar
+ hi def link mnvRuby	mnvCommand
+ hi def link mnvScriptDelim	Comment
+ hi def link mnvScriptHeredocStart	mnvLetHeredocStart
+ hi def link mnvScriptHeredocStop	mnvLetHeredocStop
+ hi def link mnvSearch	mnvString
+ hi def link mnvSearchDelim	Delimiter
+ hi def link mnvSep	Delimiter
+ hi def link mnvSet	mnvCommand
+ hi def link mnvSetAll	mnvOption
+ hi def link mnvSetBang	mnvBang
+ hi def link mnvSetComment	mnvComment
+ hi def link mnvSetMod	mnvOption
+ hi def link mnvSetSep	mnvSep
+ hi def link mnvSetTermcap	mnvOption
+ hi def link mnvShebang	PreProc
+ hi def link mnvSleep	mnvCommand
+ hi def link mnvSleepArg	Constant
+ hi def link mnvSleepBang	mnvBang
+ hi def link mnvSort	mnvCommand
+ hi def link mnvSortBang	mnvBang
+ hi def link mnvSortOptions	Special
+ hi def link mnvSpecFile	Identifier
+ hi def link mnvSpecFileMod	mnvSpecFile
+ hi def link mnvSpecial	Type
+ hi def link mnvStringCont	mnvString
+ hi def link mnvString	String
+ hi def link mnvStringEnd	mnvString
+ hi def link mnvStringInterpolationBrace	mnvEscape
+ hi def link mnvSubst1	mnvSubst
+ hi def link mnvSubstCount	Number
+ hi def link mnvSubstDelim	Delimiter
+ hi def link mnvSubstFlags	Special
+ hi def link mnvSubstSubstr	SpecialChar
+ hi def link mnvSubstTwoBS	mnvString
+ hi def link mnvSubst	mnvCommand
+ hi def link mnvSynCase	Type
+ hi def link mnvSyncCcomment	Type
+ hi def link mnvSynCchar	mnvSynOption
+ hi def link mnvSynCcharValue	Character
+ hi def link mnvSyncClear	Type
+ hi def link mnvSyncFromstart	Type
+ hi def link mnvSyncGroup	mnvGroupName
+ hi def link mnvSyncGroupName	mnvGroupName
+ hi def link mnvSyncKey	Type
+ hi def link mnvSyncLinebreak	Type
+ hi def link mnvSyncLinecont	Type
+ hi def link mnvSyncLines	Type
+ hi def link mnvSyncMatch	Type
+ hi def link mnvSyncNone	Type
+ hi def link mnvSynConceal	Type
+ hi def link mnvSynContains	mnvSynOption
+ hi def link mnvSyncRegion	Type
+ hi def link mnvSynFoldlevel	Type
+ hi def link mnvSynIskeyword	Type
+ hi def link mnvSynIskeywordSep	Delimiter
+ hi def link mnvSynContainedin	mnvSynContains
+ hi def link mnvSynKeyOpt	mnvSynOption
+ hi def link mnvSynMtchGrp	mnvSynOption
+ hi def link mnvSynMtchOpt	mnvSynOption
+ hi def link mnvSynNextgroup	mnvSynOption
+ hi def link mnvSynNotPatRange	mnvSynRegPat
+ hi def link mnvSynOption	Special
+ hi def link mnvSynPatRange	mnvString
+ hi def link mnvSynReg	Type
+ hi def link mnvSynRegOpt	mnvSynOption
+ hi def link mnvSynRegPat	mnvString
+ hi def link mnvSynSpell	Type
+ hi def link mnvSyntax	mnvCommand
+ hi def link mnvSynType	mnvSpecial
+ hi def link mnvSyntime	mnvCommand
+ hi def link mnvSyntimeArg	mnvSpecial
+ hi def link mnvTcl	mnvCommand
+ hi def link mnvTerminal	mnvCommand
+ hi def link mnvTerminalContinue	mnvContinue
+ hi def link mnvTerminalContinueComment	mnvContinueComment
+ hi def link mnvTerminalOption		mnvSpecial
+ hi def link mnvTerminalKillOptionArg	Constant
+ hi def link mnvTerminalSizeOptionArg	Constant
+ hi def link mnvTerminalTypeOptionArg	Constant
+ hi def link mnvThrow	mnvCommand
+ hi def link mnvTodo	Todo
+ hi def link mnvType	Type
+ hi def link mnvTypeAny	mnvType
+ hi def link mnvTypeObject	mnvType
+ hi def link mnvTypeObjectBracket	mnvTypeObject
+ hi def link mnvUniq	mnvCommand
+ hi def link mnvUniqBang	mnvBang
+ hi def link mnvUniqOptions	Special
+ hi def link mnvUnlet	mnvCommand
+ hi def link mnvUnletBang	mnvBang
+ hi def link mnvUnmap	mnvMap
+ hi def link mnvUserCmd	mnvCommand
+ hi def link mnvUserCmdAttrAddr	mnvSpecial
+ hi def link mnvUserCmdAttrComplete	mnvSpecial
+ hi def link mnvUserCmdAttrCompleteFunc	mnvVar
+ hi def link mnvUserCmdAttrNargs	mnvSpecial
+ hi def link mnvUserCmdAttrRange	mnvSpecial
+ hi def link mnvUserCmdAttrKey	mnvUserCmdAttr
+ hi def link mnvUserCmdAttr	Special
+ hi def link mnvUserCmdAttrError	Error
+ hi def link mnvUserCmdError	Error
+ hi def link mnvUserCmdKey	mnvCommand
+ hi def link mnvUserFunc	Normal
+ hi def link mnvVar	Normal
+ hi def link mnvVarScope	Identifier
+ hi def link mnvMNVgrep	mnvCommand
+ hi def link mnvMNVgrepadd	mnvCommand
+ hi def link mnvMNVgrepBang	mnvBang
+ hi def link mnvMNVgrepFlags	Special
+ hi def link mnvMNVVar	Identifier
+ hi def link mnvMNVVarName	Identifier
+ hi def link mnvWarn	WarningMsg
+ hi def link mnvWildcard	Special
+ hi def link mnvWildcardBraceComma	mnvWildcard
+ hi def link mnvWildcardBracket	mnvWildcard
+ hi def link mnvWildcardBracketCaret	mnvWildcard
+ hi def link mnvWildcardBracketCharacter	Normal
+ hi def link mnvWildcardBracketCharacter	Normal
+ hi def link mnvWildcardBracketCharacterClass	mnvWildCard
+ hi def link mnvWildcardBracketCollatingSymbol	mnvWildCard
+ hi def link mnvWildcardBracketEnd		mnvWildcard
+ hi def link mnvWildcardBracketEquivalenceClass	mnvWildCard
+ hi def link mnvWildcardBracketEscape	mnvWildcard
+ hi def link mnvWildcardBracketHyphen	mnvWildcard
+ hi def link mnvWildcardBracketRightBracket	mnvWildcardBracketCharacter
+ hi def link mnvWildcardBracketStart	mnvWildcard
+ hi def link mnvWildcardEscape	mnvWildcard
+ hi def link mnvWildcardInterval	mnvWildcard
+ hi def link mnvWildcardQuestion	mnvWildcard
+ hi def link mnvWildcardStar	mnvWildcard
+ hi def link mnvWinCmd	mnvCommand
+
+ hi def link mnv9Abstract	mnvCommand
+ hi def link mnv9Boolean	Boolean
+ hi def link mnv9Class	mnvCommand
+ hi def link mnv9Comment	Comment
+ hi def link mnv9CommentError	mnvError
+ hi def link mnv9CommentTitle	PreProc
+ hi def link mnv9ConstructorDefParam	mnvVar
+ hi def link mnv9Const	mnvCommand
+ hi def link mnv9ContinueComment	mnvContinueComment
+ hi def link mnv9Enum	mnvCommand
+ hi def link mnv9EnumImplementedInterfaceComment	mnv9Comment
+ hi def link mnv9EnumImplements	mnv9Implements
+ hi def link mnv9EnumNameComment	mnv9Comment
+ hi def link mnv9EnumNameContinue	mnvContinue
+ hi def link mnv9EnumNameContinueComment	mnv9Comment
+ hi def link mnv9EnumValueListCommaComment	mnv9Comment
+ hi def link mnv9Export	mnvCommand
+ hi def link mnv9Extends	Keyword
+ hi def link mnv9Final	mnvCommand
+ hi def link mnv9For	mnvCommand
+ hi def link mnv9ForInComment	mnv9Comment
+ hi def link mnv9Implements	Keyword
+ hi def link mnv9AbstractDef	mnvCommand
+ hi def link mnv9Interface	mnvCommand
+ hi def link mnv9LambdaOperator	mnvOper
+ hi def link mnv9LambdaOperatorComment	mnv9Comment
+ hi def link mnv9LambdaParen	mnvParenSep
+ hi def link mnv9LhsRegister	mnvLetRegister
+ hi def link mnv9LhsVariable	mnvVar
+ hi def link mnv9LineComment	mnvComment
+ hi def link mnv9MethodDef	mnvCommand
+ hi def link mnv9MethodDefComment	mnvDefComment
+ hi def link mnv9MethodNameError	mnvFunctionError
+ hi def link mnv9Null	Constant
+ hi def link mnv9Public	mnvCommand
+ hi def link mnv9Search	mnvString
+ hi def link mnv9SearchDelim	Delimiter
+ hi def link mnv9Static	mnvCommand
+ hi def link mnv9Super	Identifier
+ hi def link mnv9This	Identifier
+ hi def link mnv9Type	mnvCommand
+ hi def link mnv9TypeEquals	mnvOper
+ hi def link mnv9Variable	mnvVar
+ hi def link mnv9VariableType	mnvType
+ hi def link mnv9VariableTypeAny	mnvTypeAny
+ hi def link mnv9VariableTypeObject	mnvTypeObject
+ hi def link mnv9VariableTypeObjectBracket	mnvTypeObjectBracket
+ hi def link mnv9Var	mnvCommand
+ hi def link mnv9MNV9ScriptArg	Special
+ hi def link mnv9MNV9Script	mnvCommand
+
+ hi def link mnvCompilerSet	mnvCommand
+ hi def link mnvSynColor mnvCommand
+ hi def link mnvSynLink mnvCommand
+ hi def link mnvSynMenu	mnvCommand
+ hi def link mnvSynMenuPath	mnvMenuName
+endif
+
+" Current Syntax Variable: {{{2
+let b:current_syntax = "mnv"
+
+" ---------------------------------------------------------------------
+" Cleanup: {{{1
+delc MNV9
+delc MNVL
+delc MNVFolda
+delc MNVFoldc
+delc MNVFolde
+delc MNVFoldf
+delc MNVFoldh
+delc MNVFoldH
+delc MNVFoldi
+delc MNVFoldl
+delc MNVFoldm
+delc MNVFoldp
+delc MNVFoldP
+delc MNVFoldr
+delc MNVFoldt
+let &cpo = s:keepcpo
+unlet s:keepcpo s:mnv9script
+" mnv:ts=18 fdm=marker ft=mnv
diff --git a/uvim/runtime/syntax/mnvinfo.mnv b/uvim/runtime/syntax/mnvinfo.mnv
new file mode 100644
index 0000000000..0043d39a7f
--- /dev/null
+++ b/uvim/runtime/syntax/mnvinfo.mnv
@@ -0,0 +1,49 @@
+" MNV syntax file
+" Language:	MNV .mnvinfo file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&mnv
+
+" The lines that are NOT recognized
+syn match mnvinfoError "^[^\t].*"
+
+" The one-character one-liners that are recognized
+syn match mnvinfoStatement "^[/&$@:?=%!<]"
+
+" The two-character one-liners that are recognized
+syn match mnvinfoStatement "^[-'>"]."
+syn match mnvinfoStatement +^"".+
+syn match mnvinfoStatement "^\~[/&]"
+syn match mnvinfoStatement "^\~[hH]"
+syn match mnvinfoStatement "^\~[mM][sS][lL][eE]\d\+\~\=[/&]"
+
+syn match mnvinfoOption "^\*.*=" contains=mnvinfoOptionName
+syn match mnvinfoOptionName "\*\a*"ms=s+1 contained
+
+" Comments
+syn match mnvinfoComment "^#.*"
+
+" New style lines.  TODO: highlight numbers and strings.
+syn match mnvinfoNew "^|.*"
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link mnvinfoComment	Comment
+hi def link mnvinfoError	Error
+hi def link mnvinfoStatement	Statement
+hi def link mnvinfoNew		String
+
+let b:current_syntax = "mnvinfo"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/vimnormal.vim b/uvim/runtime/syntax/mnvnormal.mnv
index df672c5236..df672c5236 100644
--- a/uvim/runtime/syntax/vimnormal.vim
+++ b/uvim/runtime/syntax/mnvnormal.mnv
diff --git a/uvim/runtime/syntax/modconf.vim b/uvim/runtime/syntax/modconf.mnv
index 76b36edcf0..e5e6a5440b 100644
--- a/uvim/runtime/syntax/modconf.vim
+++ b/uvim/runtime/syntax/modconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             modules.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-10-25
@@ -10,7 +10,7 @@ endif
 setlocal iskeyword+=-
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword modconfTodo         FIXME TODO XXX NOTE
 
diff --git a/uvim/runtime/syntax/model.vim b/uvim/runtime/syntax/model.mnv
index 2df380c629..c0dfeac3c8 100644
--- a/uvim/runtime/syntax/model.vim
+++ b/uvim/runtime/syntax/model.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Model
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " very basic things only (based on the vgrindefs file).
 " If you use this language, please improve it, and send patches!
@@ -42,4 +42,4 @@ hi def link modelString		String
 
 let b:current_syntax = "model"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/modsim3.vim b/uvim/runtime/syntax/modsim3.mnv
index ce35033402..a6db5f2bfd 100644
--- a/uvim/runtime/syntax/modsim3.vim
+++ b/uvim/runtime/syntax/modsim3.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Modsim III, by compuware corporation (www.compuware.com)
 " Maintainer:	Philipp Jocham <flip@sbox.tu-graz.ac.at>
 " Extension:	*.mod
@@ -6,7 +6,7 @@
 "
 " 2001 March 24:
 "  - Modsim III is a registered trademark from compuware corporation
-"  - made compatible with Vim 6.0
+"  - made compatible with MNV 6.0
 "
 " 1999 Apr 22 : Changed modsim3Literal from region to match
 "
@@ -93,5 +93,5 @@ hi def link modsim3BuiltinNoParen	Function
 
 let b:current_syntax = "modsim3"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
 
diff --git a/uvim/runtime/syntax/modula2.vim b/uvim/runtime/syntax/modula2.mnv
index 3c1346e9f5..4bfd8687ba 100644
--- a/uvim/runtime/syntax/modula2.vim
+++ b/uvim/runtime/syntax/modula2.mnv
@@ -1,23 +1,23 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Modula-2
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	pf@artcom0.north.de (Peter Funk)
 " Last Change:		2024 Jan 04
-" 2025 Apr 16 by Vim Project (set 'cpoptions' for line continuation, #17121)
+" 2025 Apr 16 by MNV Project (set 'cpoptions' for line continuation, #17121)
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let dialect = modula2#GetDialect()
-exe "runtime! syntax/modula2/opt/" .. dialect .. ".vim"
+exe "runtime! syntax/modula2/opt/" .. dialect .. ".mnv"
 
 let b:current_syntax = "modula2"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet:
+" mnv: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/modula2/opt/iso.vim b/uvim/runtime/syntax/modula2/opt/iso.mnv
index 5bd24f6885..270fa34d2e 100644
--- a/uvim/runtime/syntax/modula2/opt/iso.vim
+++ b/uvim/runtime/syntax/modula2/opt/iso.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Modula-2 (ISO)
 " Maintainer:  B.Kowarsch <trijezdci@moc.liamg>
 " Last Change: 2016 August 22
 
 " ----------------------------------------------------
-" THIS FILE IS LICENSED UNDER THE VIM LICENSE
-" see https://github.com/vim/vim/blob/master/LICENSE
+" THIS FILE IS LICENSED UNDER THE MNV LICENSE
+" see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
 " ----------------------------------------------------
 
 " Remarks:
-" Vim Syntax files are available for the following Modula-2 dialects:
-" * for the PIM dialect : m2pim.vim
-" * for the ISO dialect : m2iso.vim (this file)
-" * for the R10 dialect : m2r10.vim
+" MNV Syntax files are available for the following Modula-2 dialects:
+" * for the PIM dialect : m2pim.mnv
+" * for the ISO dialect : m2iso.mnv (this file)
+" * for the R10 dialect : m2r10.mnv
 
 " -----------------------------------------------------------------------------
 " This syntax description follows ISO standard IS-10514 (aka ISO Modula-2)
@@ -23,7 +23,7 @@
 
 " Parameters:
 "
-" Vim's filetype script recognises Modula-2 dialect tags within the first 200
+" MNV's filetype script recognises Modula-2 dialect tags within the first 200
 " lines of Modula-2 .def and .mod input files.  The script sets filetype and
 " dialect automatically when a valid dialect tag is found in the input file.
 " The dialect tag for the ISO dialect is (*!m2iso*).  It is recommended to put
@@ -45,7 +45,7 @@
 " Variable g:modula2_iso_disallow_synonyms controls the rendering of @, & and ~:
 " if defined and set to a non-zero value, they are rendered as errors.
 "
-" Variables may be defined in Vim startup file .vimrc
+" Variables may be defined in MNV startup file .mnvrc
 "
 " Examples:
 "  let g:modula2_default_dialect = 'm2iso'
@@ -375,6 +375,6 @@ highlight default link modula2IllegalIdent Error
 
 let b:current_syntax = "modula2"
 
-" vim: ts=4
+" mnv: ts=4
 
 " END OF FILE
diff --git a/uvim/runtime/syntax/modula2/opt/pim.vim b/uvim/runtime/syntax/modula2/opt/pim.mnv
index 1626db91cf..213f224da8 100644
--- a/uvim/runtime/syntax/modula2/opt/pim.vim
+++ b/uvim/runtime/syntax/modula2/opt/pim.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Modula-2 (PIM)
 " Maintainer:  B.Kowarsch <trijezdci@moc.liamg>
 " Last Change: 2016 August 22
 
 " ----------------------------------------------------
-" THIS FILE IS LICENSED UNDER THE VIM LICENSE
-" see https://github.com/vim/vim/blob/master/LICENSE
+" THIS FILE IS LICENSED UNDER THE MNV LICENSE
+" see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
 " ----------------------------------------------------
 
 " Remarks:
-" Vim Syntax files are available for the following Modula-2 dialects:
-" * for the PIM dialect : m2pim.vim (this file)
-" * for the ISO dialect : m2iso.vim
-" * for the R10 dialect : m2r10.vim
+" MNV Syntax files are available for the following Modula-2 dialects:
+" * for the PIM dialect : m2pim.mnv (this file)
+" * for the ISO dialect : m2iso.mnv
+" * for the R10 dialect : m2r10.mnv
 
 " -----------------------------------------------------------------------------
 " This syntax description follows the 3rd and 4th editions of N.Wirth's Book
@@ -24,7 +24,7 @@
 
 " Parameters:
 "
-" Vim's filetype script recognises Modula-2 dialect tags within the first 200
+" MNV's filetype script recognises Modula-2 dialect tags within the first 200
 " lines of Modula-2 .def and .mod input files.  The script sets filetype and
 " dialect automatically when a valid dialect tag is found in the input file.
 " The dialect tag for the PIM dialect is (*!m2pim*).  It is recommended to put
@@ -46,7 +46,7 @@
 " Variable g:modula2_pim_disallow_synonyms controls the rendering of & and ~:
 " if defined and set to a non-zero value, they are rendered as errors.
 "
-" Variables may be defined in Vim startup file .vimrc
+" Variables may be defined in MNV startup file .mnvrc
 "
 " Examples:
 "  let g:modula2_default_dialect = 'm2pim'
@@ -372,6 +372,6 @@ highlight default link modula2IllegalIdent Error
 
 let b:current_syntax = "modula2"
 
-" vim: ts=4
+" mnv: ts=4
 
 " END OF FILE
diff --git a/uvim/runtime/syntax/modula2/opt/r10.vim b/uvim/runtime/syntax/modula2/opt/r10.mnv
index 5172be54c6..0785951cc3 100644
--- a/uvim/runtime/syntax/modula2/opt/r10.vim
+++ b/uvim/runtime/syntax/modula2/opt/r10.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Modula-2 (R10)
 " Maintainer:  B.Kowarsch <trijezdci@moc.liamg>
 " Last Change: 2020 June 18 (moved repository from bb to github)
 
 " ----------------------------------------------------
-" THIS FILE IS LICENSED UNDER THE VIM LICENSE
-" see https://github.com/vim/vim/blob/master/LICENSE
+" THIS FILE IS LICENSED UNDER THE MNV LICENSE
+" see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
 " ----------------------------------------------------
 
 " Remarks:
-" Vim Syntax files are available for the following Modula-2 dialects:
-" * for the PIM dialect : m2pim.vim
-" * for the ISO dialect : m2iso.vim
-" * for the R10 dialect : m2r10.vim (this file)
+" MNV Syntax files are available for the following Modula-2 dialects:
+" * for the PIM dialect : m2pim.mnv
+" * for the ISO dialect : m2iso.mnv
+" * for the R10 dialect : m2r10.mnv (this file)
 
 " -----------------------------------------------------------------------------
 " This syntax description follows the Modula-2 Revision 2010 language report
@@ -21,7 +21,7 @@
 
 " Parameters:
 "
-" Vim's filetype script recognises Modula-2 dialect tags within the first 200
+" MNV's filetype script recognises Modula-2 dialect tags within the first 200
 " lines of Modula-2 .def and .mod input files.  The script sets filetype and
 " dialect automatically when a valid dialect tag is found in the input file.
 " The dialect tag for the R10 dialect is (*!m2r10*).  It is recommended to put
@@ -37,7 +37,7 @@
 " Variable g:modula2_r10_allow_lowline controls support for lowline in identifiers:
 " if defined and set to a non-zero value, they are recognised, otherwise not
 "
-" Variables may be defined in Vim startup file .vimrc
+" Variables may be defined in MNV startup file .mnvrc
 "
 " Examples:
 "  let g:modula2_default_dialect = 'm2r10'
@@ -157,7 +157,7 @@ syn match modula2Base16Num "0[ux][0-9A-F]\+\('[0-9A-F]\+\)*"
 "| which greatly diminishes readability and thereby increases the opportunity
 "| for error during maintenance. Ideally, regular expressions should be split
 "| into small human readable pieces with interleaved comments that explain
-"| precisely what each piece is doing.  Vim script imposes poor design. :-(
+"| precisely what each piece is doing.  MNV script imposes poor design. :-(
 
 syn match modula2Base10Num
   \ "\(\(0[bux]\@!\|[1-9]\)[0-9]*\('[0-9]\+\)*\)\(\.[0-9]\+\('[0-9]\+\)*\(e[+-]\?[0-9]\+\('[0-9]\+\)*\)\?\)\?"
@@ -447,6 +447,6 @@ highlight default link modula2IllegalIdent Error
 
 let b:current_syntax = "modula2"
 
-" vim: ts=4
+" mnv: ts=4
 
 " END OF FILE
diff --git a/uvim/runtime/syntax/modula3.vim b/uvim/runtime/syntax/modula3.mnv
index 67243db600..536707b224 100644
--- a/uvim/runtime/syntax/modula3.vim
+++ b/uvim/runtime/syntax/modula3.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Modula-3
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Timo Pedersen <dat97tpe@ludat.lth.se>
@@ -142,4 +142,4 @@ hi def link modula3Type		Type		"}}}
 
 let b:current_syntax = "modula3"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/mojo.vim b/uvim/runtime/syntax/mojo.mnv
index b7dae24a15..3ca3e329ba 100644
--- a/uvim/runtime/syntax/mojo.vim
+++ b/uvim/runtime/syntax/mojo.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Mojo
 " Maintainer:	Mahmoud Abduljawad <me@mahmoudajawad.com>
 " Last Change:	2023 Sep 09
@@ -6,7 +6,7 @@
 "         	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
-"		This is based on Vim Python highlighting
+"		This is based on MNV Python highlighting
 "
 "		- introduced highlighting of doctests
 "		- updated keywords, built-ins, and exceptions
@@ -53,7 +53,7 @@ endif
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if exists("mojo_no_doctest_highlight")
   let mojo_no_doctest_code_highlight = 1
@@ -313,4 +313,4 @@ let b:current_syntax = "mojo"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2 sts=2 ts=8 noet:
+" mnv:set sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/monk.vim b/uvim/runtime/syntax/monk.mnv
index 3af810173a..098513edff 100644
--- a/uvim/runtime/syntax/monk.vim
+++ b/uvim/runtime/syntax/monk.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Monk (See-Beyond Technologies)
 " Maintainer: Mike Litherland <litherm@ccf.org>
 " Last Change: 2012 Feb 03 by Thilo Six
@@ -27,7 +27,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/moo.vim b/uvim/runtime/syntax/moo.mnv
index 6f2dd59e84..06c8032887 100644
--- a/uvim/runtime/syntax/moo.vim
+++ b/uvim/runtime/syntax/moo.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MOO
 " Maintainer:	Timo Frenay <timo@frenay.net>
 " Last Change:	2020 Oct 19
-" Note:		Requires Vim 6.0 or above
+" Note:		Requires MNV 6.0 or above
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -170,4 +170,4 @@ hi def link mooNonCode PreProc
 
 let b:current_syntax = "moo"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mp.vim b/uvim/runtime/syntax/mp.mnv
index 541ac4791d..da99f119b0 100644
--- a/uvim/runtime/syntax/mp.vim
+++ b/uvim/runtime/syntax/mp.mnv
@@ -1,6 +1,6 @@
-vim9script
+mnv9script
 
-# Vim syntax file
+# MNV syntax file
 # Language:           MetaPost
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
@@ -31,7 +31,7 @@ g:mf_plain_modes  = 0 # No METAFONT modes
 g:mf_other_macros = 0 # cmbase.mf, logo.mf, ... neither
 
 # Read the METAFONT syntax to start with
-runtime! syntax/mf.vim
+runtime! syntax/mf.mnv
 unlet b:current_syntax # Necessary for syn include below
 
 # Restore the value of existing global variables
@@ -52,14 +52,14 @@ else
 endif
 
 # Use TeX highlighting inside verbatimtex/btex... etex
-syn include @MPTeX syntax/tex.vim
+syn include @MPTeX syntax/tex.mnv
 unlet b:current_syntax
 # These are defined as keywords rather than using matchgroup
 # in order to make them available to syntaxcomplete.
 syn keyword mpTeXdelim       btex etex verbatimtex contained
 syn region mpTeXinsert matchgroup=mpTeXdelim start=/\<verbatimtex\>\|\<btex\>/ end=/\<etex\>/ keepend contains=@MPTeX,mpTeXdelim
 
-# iskeyword must be set after the syn include above, because tex.vim sets `syn
+# iskeyword must be set after the syn include above, because tex.mnv sets `syn
 # iskeyword`. Note that keywords do not contain numbers (numbers are
 # subscripts)
 syntax iskeyword @,_
@@ -237,7 +237,7 @@ if get(b:, "mp_metafun", get(g:, "mp_metafun", 0))
 
   syn keyword mpPrimitive runscript
 
-  runtime! syntax/shared/context-data-metafun.vim
+  runtime! syntax/shared/context-data-metafun.mnv
 
   hi def link metafunCommands   Statement
   hi def link metafunInternals  Identifier
@@ -270,4 +270,4 @@ hi def link mpTeXKeyword   Identifier
 
 b:current_syntax = "mp"
 
-# vim: sw=2 fdm=marker
+# mnv: sw=2 fdm=marker
diff --git a/uvim/runtime/syntax/mplayerconf.vim b/uvim/runtime/syntax/mplayerconf.mnv
index 84ad2daf13..4de73fa62a 100644
--- a/uvim/runtime/syntax/mplayerconf.vim
+++ b/uvim/runtime/syntax/mplayerconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             mplayer(1) configuration file
 " Maintainer:           Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/mrxvtrc.vim b/uvim/runtime/syntax/mrxvtrc.mnv
index 2ef434d2b2..3382befc0e 100644
--- a/uvim/runtime/syntax/mrxvtrc.vim
+++ b/uvim/runtime/syntax/mrxvtrc.mnv
@@ -1,7 +1,7 @@
-" Description	: Vim syntax file for mrxvtrc (for mrxvt-0.5.0 and up)
+" Description	: MNV syntax file for mrxvtrc (for mrxvt-0.5.0 and up)
 " Created	: Wed 26 Apr 2006 01:20:53 AM CDT
 " Modified	: Thu 02 Feb 2012 08:37:45 PM EST
-" Maintainer	: GI <a@b.c>, where a='gi1242+vim', b='gmail', c='com'
+" Maintainer	: GI <a@b.c>, where a='gi1242+mnv', b='gmail', c='com'
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/msidl.vim b/uvim/runtime/syntax/msidl.mnv
index 57eaecaa4f..b381adce31 100644
--- a/uvim/runtime/syntax/msidl.vim
+++ b/uvim/runtime/syntax/msidl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     MS IDL (Microsoft dialect of Interface Description Language)
 " Maintainer:   Vadim Zeitlin <vadim@wxwindows.org>
 " Last Change:  2012 Feb 12 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Misc basic
 syn match   msidlId		"[a-zA-Z][a-zA-Z0-9_]*"
diff --git a/uvim/runtime/syntax/msmessages.vim b/uvim/runtime/syntax/msmessages.mnv
index 5faee978b4..a9c756c5eb 100644
--- a/uvim/runtime/syntax/msmessages.vim
+++ b/uvim/runtime/syntax/msmessages.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	MS Message Text files (*.mc)
 " Maintainer:	Kevin Locke <kwl7@cornell.edu>
 " Last Change:	2008 April 09
-" Location:	http://kevinlocke.name/programs/vim/syntax/msmessages.vim
+" Location:	http://kevinlocke.name/programs/mnv/syntax/msmessages.mnv
 
 " See format description at <http://msdn2.microsoft.com/en-us/library/aa385646.aspx>
-" This file is based on the rc.vim and c.vim
+" This file is based on the rc.mnv and c.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -42,7 +42,7 @@ syn match msmessagesNameDef /\w\+/ display contained
 
 " Comments are converted to C source (by removing leading ;)
 " So we highlight the comments as C
-syn include @msmessagesC syntax/c.vim
+syn include @msmessagesC syntax/c.mnv
 unlet b:current_syntax
 syn region msmessagesCComment matchgroup=msmessagesComment start=/;/ end=/$/ contains=@msmessagesC keepend
 
@@ -58,7 +58,7 @@ syn match msmessagesFormat display	/%[0.%\\br]/ contained
 syn match msmessagesFormat display	/%!\(\s\)\@=/ contained
 
 " Integer number, or floating point number without a dot and with "f".
-" Copied from c.vim
+" Copied from c.mnv
 syn case ignore
 "(long) integer
 syn match msmessagesNumber	display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
@@ -129,4 +129,4 @@ hi def link msmessagesNameErr		Error
 
 let b:current_syntax = "msmessages"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/msql.vim b/uvim/runtime/syntax/msql.mnv
index 60e75a7ef6..6e3ebe16ff 100644
--- a/uvim/runtime/syntax/msql.vim
+++ b/uvim/runtime/syntax/msql.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	msql
 " Maintainer:	Lutz Eymers <ixtab@polzin.com>
-" URL:		http://www.isp.de/data/msql.vim
-" Email:	Subject: send syntax_vim.tgz
+" URL:		http://www.isp.de/data/msql.mnv
+" Email:	Subject: send syntax_mnv.tgz
 " Last Change:	2001 May 10
 "
 " Options	msql_sql_query = 1 for SQL syntax highligthing inside strings
@@ -17,7 +17,7 @@ if !exists("main_syntax")
   let main_syntax = 'msql'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster htmlPreproc add=msqlRegion
@@ -37,7 +37,7 @@ syn keyword msqlEnvVar HTTP_ACCECT HTTP_USER_AGENT HTTP_IF_MODIFIED_SINCE  conta
 syn keyword msqlEnvVar HTTP_FROM HTTP_REFERER contained
 
 " Inlclude lLite
-syn include @msqlLite <sfile>:p:h/lite.vim
+syn include @msqlLite <sfile>:p:h/lite.mnv
 
 " Msql Region
 syn region msqlRegion matchgroup=Delimiter start="<!$" start="<![^!->D]" end=">" contains=@msqlLite,msql.*
@@ -80,4 +80,4 @@ if main_syntax == 'msql'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/mss.vim b/uvim/runtime/syntax/mss.mnv
index de95d1d2ad..5967396e2f 100644
--- a/uvim/runtime/syntax/mss.vim
+++ b/uvim/runtime/syntax/mss.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Vivado mss file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2024 Oct 22
 " Document:	https://docs.amd.com/r/2020.2-English/ug1400-vitis-embedded/Microprocessor-Software-Specification-MSS
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
diff --git a/uvim/runtime/syntax/mupad.vim b/uvim/runtime/syntax/mupad.mnv
index df87ad14fe..579b6420ba 100644
--- a/uvim/runtime/syntax/mupad.vim
+++ b/uvim/runtime/syntax/mupad.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    MuPAD source
 " Maintainer:  Dave Silvia <dsilvia@mchsi.com>
 " Filenames:   *.mu
diff --git a/uvim/runtime/syntax/murphi.vim b/uvim/runtime/syntax/murphi.mnv
index 347e17f5ac..2c017ac43a 100644
--- a/uvim/runtime/syntax/murphi.vim
+++ b/uvim/runtime/syntax/murphi.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Murphi model checking language
 " Maintainer: Matthew Fernandez <matthew.fernandez@gmail.com>
 " Last Change: 2019 Aug 27
diff --git a/uvim/runtime/syntax/mush.vim b/uvim/runtime/syntax/mush.mnv
index efaae50ae3..97a2e21bf7 100644
--- a/uvim/runtime/syntax/mush.vim
+++ b/uvim/runtime/syntax/mush.mnv
@@ -1,6 +1,6 @@
 " MUSHcode syntax file
 " Maintainer: Rick Bird <nveid@nveid.com>
-" Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
+" Based on mnv Syntax file by: Bek Oberin <gossamer@tertius.net.au>
 " Last Updated: Fri Nov 04 20:28:15 2005
 "
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/muttrc.vim b/uvim/runtime/syntax/muttrc.mnv
index 34ebc4f110..a59f69c05a 100644
--- a/uvim/runtime/syntax/muttrc.vim
+++ b/uvim/runtime/syntax/muttrc.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Mutt setup files
-" Original:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+" Original:	Preben 'Peppe' Guldberg <peppe-mnv@wielders.org>
 " Maintainer:	Luna Celeste <luna@unixpoet.dev>
 " Last Change:	14 Aug 2023
 " 2025 May 19 re-include missing mutt Keywords #17344
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Set the keyword characters
 setlocal isk=@,48-57,_,-
@@ -89,7 +89,7 @@ syn match muttrcSetNumAssignment contained skipwhite /=\s*\d\+/hs=s+1 nextgroup=
 syn match muttrcSetNumAssignment contained skipwhite /=\s*"\d\+"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 syn match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-" Now catch some email addresses and headers (purified version from mail.vim)
+" Now catch some email addresses and headers (purified version from mail.mnv)
 syn match muttrcEmail		"[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
 syn match muttrcHeader		"\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
 
@@ -219,8 +219,8 @@ syn keyword muttrcVarBool	skipwhite contained
 			\ invhide_top_limited invhide_top_missing invhistory_remove_dups
 			\ invhonor_disposition invidn_decode invidn_encode
 			\ invignore_linear_white_space invignore_list_reply_to
-			\ invimap_check_subscribed invimap_condstore invimap_deflate invimap_list_subscribed
-			\ invimap_passive invimap_peek invimap_qresync invimap_servernoise invimplicit_autoview
+			\ inmnvap_check_subscribed inmnvap_condstore inmnvap_deflate inmnvap_list_subscribed
+			\ inmnvap_passive inmnvap_peek inmnvap_qresync inmnvap_servernoise inmnvplicit_autoview
 			\ invinclude_encrypted invinclude_onlyfirst invkeep_flagged invlocal_date_header
 			\ invmail_check_recent invmail_check_stats invmailcap_sanitize invmaildir_check_cur
 			\ invmaildir_header_cache_verify invmaildir_trash invmark_old invmarkers invmenu_move_off
@@ -432,7 +432,7 @@ syn keyword muttrcVarStr	contained skipwhite
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 " Present in 1.4.2.1 (pgp_create_traditional was a bool then)
-syn keyword muttrcVarBool	contained skipwhite imap_force_ssl noimap_force_ssl invimap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarBool	contained skipwhite imap_force_ssl noimap_force_ssl inmnvap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 "syn keyword muttrcVarQuad	contained pgp_create_traditional nopgp_create_traditional invpgp_create_traditional
 syn keyword muttrcVarStr	contained skipwhite alternates nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
@@ -844,4 +844,4 @@ let b:current_syntax = "muttrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-"EOF	vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim
+"EOF	mnv: ts=8 noet tw=100 sw=8 sts=0 ft=mnv
diff --git a/uvim/runtime/syntax/mysql.vim b/uvim/runtime/syntax/mysql.mnv
index 49b53313c9..e522f5db17 100644
--- a/uvim/runtime/syntax/mysql.vim
+++ b/uvim/runtime/syntax/mysql.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     mysql
 " Maintainer:   Kenneth J. Pronovici <pronovic@ieee.org>
 " Filenames:    *.mysql
-" URL:          ftp://cedar-solutions.com/software/mysql.vim (https://github.com/pronovic/vim-syntax/blob/master/mysql.vim)
+" URL:          ftp://cedar-solutions.com/software/mysql.mnv (https://github.com/pronovic/mnv-syntax/blob/master/mysql.mnv)
 " Note:         The definitions below are taken from the mysql user manual as of April 2002, for version 3.23 and have been updated
 "               in July 2024 with the docs for version 8.4
 " Last Change:  2016 Apr 11
-"  2024-07-21:  update MySQL functions as of MySQL 8.4 (by Vim Project)
+"  2024-07-21:  update MySQL functions as of MySQL 8.4 (by MNV Project)
 " 
 
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/n1ql.vim b/uvim/runtime/syntax/n1ql.mnv
index bef65d8f64..1bb0142f3d 100644
--- a/uvim/runtime/syntax/n1ql.vim
+++ b/uvim/runtime/syntax/n1ql.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    N1QL / Couchbase Server
 " Maintainer:  Eugene Ciurana <n1ql AT cime.net>
 " Version:     1.0
-" Source:      https://github.com/pr3d4t0r/n1ql-vim-syntax
+" Source:      https://github.com/pr3d4t0r/n1ql-mnv-syntax
 "
-" License:     Vim is Charityware.  n1ql.vim syntax is Charityware.
+" License:     MNV is Charityware.  n1ql.mnv syntax is Charityware.
 "              (c) Copyright 2017 by Eugene Ciurana / pr3d4t0r.  Licensed
-"              under the standard VIM LICENSE - Vim command :help uganda.txt
+"              under the standard MNV LICENSE - MNV command :help uganda.txt
 "              for details.
 "
 " Questions, comments:  <n1ql AT cime.net>
 "                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
 "
-" vim: set fileencoding=utf-8:
+" mnv: set fileencoding=utf-8:
 
 
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/named.vim b/uvim/runtime/syntax/named.mnv
index 292d1b2bbf..21b535a8cd 100644
--- a/uvim/runtime/syntax/named.vim
+++ b/uvim/runtime/syntax/named.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	BIND configuration file
 " Maintainer:	Nick Hibma <nick@van-laarhoven.org>
 " Last Change:	2019 Oct 08
 " Filenames:	named.conf, rndc.conf
-" Location:	http://www.van-laarhoven.org/vim/syntax/named.vim
+" Location:	http://www.van-laarhoven.org/mnv/syntax/named.mnv
 "
 " Previously maintained by glory hump <rnd@web-drive.ru> and updated by Marcin
 " Dalecki.
@@ -226,4 +226,4 @@ unlet s:save_cpo
 
 let b:current_syntax = "named"
 
-" vim: ts=17
+" mnv: ts=17
diff --git a/uvim/runtime/syntax/nanorc.vim b/uvim/runtime/syntax/nanorc.mnv
index 606ac7fdf1..551a71af68 100644
--- a/uvim/runtime/syntax/nanorc.vim
+++ b/uvim/runtime/syntax/nanorc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             nanorc(5) - GNU nano configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword nanorcTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/nasm.vim b/uvim/runtime/syntax/nasm.mnv
index 22d7c2729a..1bb1d6ceea 100644
--- a/uvim/runtime/syntax/nasm.vim
+++ b/uvim/runtime/syntax/nasm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	NASM - The Netwide Assembler (v0.98)
 " Maintainer:	Andrii Sokolov	<andriy145@gmail.com>
 " Original Author:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
@@ -22,7 +22,7 @@ endif
 syn case ignore
 
 
-" Vim search and movement commands on identifers
+" MNV search and movement commands on identifers
 "  Comments at start of a line inside which to skip search for indentifiers
 setlocal comments=:;
 "  Identifier Keyword characters (defines \k)
@@ -81,7 +81,7 @@ syn match   nasmCStringEscape  display contained "\\[’"‘\\\?abtnvfre]"
 syn match   nasmCStringEscape  display contained "\\\(x\x\{2}\|\o\{1,3}\)"
 " Unicode characters
 syn match   nasmCStringEscape	display contained "\\\(u\x\{4}\|U\x\{8}\)"
-" ISO C99 format strings (copied from cFormat in runtime/syntax/c.vim)
+" ISO C99 format strings (copied from cFormat in runtime/syntax/c.mnv)
 syn match   nasmCStringFormat	display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
 syn match   nasmCStringFormat	display "%%" contained
 syn match   nasmString		+\("[^"]\{-}"\|'[^']\{-}'\)+
@@ -1189,4 +1189,4 @@ hi def link nasmInstructionPTWRITE Statement
 
 let b:current_syntax = "nasm"
 
-" vim:ts=8 sw=4
+" mnv:ts=8 sw=4
diff --git a/uvim/runtime/syntax/nastran.vim b/uvim/runtime/syntax/nastran.mnv
index 239fd6e49d..c77287abd0 100644
--- a/uvim/runtime/syntax/nastran.vim
+++ b/uvim/runtime/syntax/nastran.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language: NASTRAN input/DMAP
 " Maintainer: Tom Kowalski <trk@schaefferas.com>
 " Last change: April 27, 2001
-"  Thanks to the authors and maintainers of fortran.vim.
+"  Thanks to the authors and maintainers of fortran.mnv.
 "		Since DMAP shares some traits with fortran, this syntax file
-"		is based on the fortran.vim syntax file.
+"		is based on the fortran.mnv syntax file.
 "----------------------------------------------------------------------
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -178,4 +178,4 @@ hi def link nastranUtilCard	     nastranDmapexecmod
 
 let b:current_syntax = "nastran"
 
-"EOF vim: ts=8 noet tw=120 sw=8 sts=0
+"EOF mnv: ts=8 noet tw=120 sw=8 sts=0
diff --git a/uvim/runtime/syntax/natural.vim b/uvim/runtime/syntax/natural.mnv
index be529f2d85..eb78b9ddbc 100644
--- a/uvim/runtime/syntax/natural.vim
+++ b/uvim/runtime/syntax/natural.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:	NATURAL
 " Version:	2.1.0.5
@@ -13,7 +13,7 @@ endif
 setlocal iskeyword+=-,*,#,+,_,/
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " NATURAL is case insensitive
 syntax case ignore
@@ -198,4 +198,4 @@ let b:current_syntax = "natural"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set ts=8 sw=8 noet ft=vim list:
+" mnv:set ts=8 sw=8 noet ft=mnv list:
diff --git a/uvim/runtime/syntax/ncf.vim b/uvim/runtime/syntax/ncf.mnv
index 0027fd4ef8..c3685feb07 100644
--- a/uvim/runtime/syntax/ncf.vim
+++ b/uvim/runtime/syntax/ncf.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Novell "NCF" Batch File
 " Maintainer:   Jonathan J. Miner <miner@doit.wisc.edu>
 " Last Change:	Tue, 04 Sep 2001 16:20:33 CDT
-" $Id: ncf.vim,v 1.1 2004/06/13 16:31:58 vimboss Exp $
+" $Id: ncf.mnv,v 1.1 2004/06/13 16:31:58 mnvboss Exp $
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/neomuttlog.vim b/uvim/runtime/syntax/neomuttlog.mnv
index 27f73493bd..5f875eb8fe 100644
--- a/uvim/runtime/syntax/neomuttlog.vim
+++ b/uvim/runtime/syntax/neomuttlog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:  NeoMutt log files
 " Maintainer:  Richard Russon <rich@flatcap.org>
 " Last Change:  2024 Oct 12
@@ -66,4 +66,4 @@ highlight link neolog_notify_key  neolog_notify
 
 let b:current_syntax = "neomuttlog"
 
-" vim: ts=2 et tw=100 sw=2 sts=0 ft=vim
+" mnv: ts=2 et tw=100 sw=2 sts=0 ft=mnv
diff --git a/uvim/runtime/syntax/neomuttrc.vim b/uvim/runtime/syntax/neomuttrc.mnv
index 815e160bbb..cdb88b1fa0 100644
--- a/uvim/runtime/syntax/neomuttrc.vim
+++ b/uvim/runtime/syntax/neomuttrc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	NeoMutt setup files
 " Maintainer:	Richard Russon <rich@flatcap.org>
 " Previous Maintainer:	Guillaume Brogi <gui-gui@netcourrier.com>
 " Last Change:	2024 Oct 12
-" Original version based on syntax/muttrc.vim
+" Original version based on syntax/muttrc.mnv
 
 " This file covers NeoMutt 2024-10-02
 
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Set the keyword characters
 setlocal isk=@,48-57,_,-
@@ -83,7 +83,7 @@ syntax match muttrcSetNumAssignment  contained skipwhite /=\s*\d\+/hs=s+1
 syntax match muttrcSetNumAssignment  contained skipwhite /=\s*"\d\+"/hs=s+1                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarString
 syntax match muttrcSetNumAssignment  contained skipwhite /=\s*'\d\+'/hs=s+1                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarString
 
-" Now catch some email addresses and headers (purified version from mail.vim)
+" Now catch some email addresses and headers (purified version from mail.mnv)
 syntax match muttrcEmail	"[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
 syntax match muttrcHeader	"\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
 
@@ -908,4 +908,4 @@ let b:current_syntax = "neomuttrc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim isk+=-
+" mnv: ts=8 noet tw=100 sw=8 sts=0 ft=mnv isk+=-
diff --git a/uvim/runtime/syntax/netrc.vim b/uvim/runtime/syntax/netrc.mnv
index 567aaa96de..95b7e5dccd 100644
--- a/uvim/runtime/syntax/netrc.vim
+++ b/uvim/runtime/syntax/netrc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             netrc(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2010-01-03
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword netrcKeyword    machine nextgroup=netrcMachine skipwhite skipnl
 syn keyword netrcKeyword    account
diff --git a/uvim/runtime/syntax/nginx.vim b/uvim/runtime/syntax/nginx.mnv
index e31f139713..661fe9fa13 100644
--- a/uvim/runtime/syntax/nginx.vim
+++ b/uvim/runtime/syntax/nginx.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
 " Last Change: Jan 09, 2026
@@ -17,7 +17,7 @@ syn region ngxString start=+[^:a-zA-Z>!\\@]\z(["']\)+lc=1 end=+\z1+ skip=+\\\\\|
 syn match ngxComment ' *#.*$'
 
 " These regular expressions where taken (and adapted) from
-" http://vim.1045645.n5.nabble.com/IPv6-support-for-quot-dns-quot-zonefile-syntax-highlighting-td1197292.html
+" http://mnv.1045645.n5.nabble.com/IPv6-support-for-quot-dns-quot-zonefile-syntax-highlighting-td1197292.html
 syn match ngxInteger '\W\zs\(\d[0-9.]*\|[0-9.]*\d\)\w\?\ze\W'
 syn match ngxIPaddr '\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}'
 syn match ngxIPaddr '\[\(\x\{1,4}:\)\{6}\(\x\{1,4}:\x\{1,4}\|\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\]'
@@ -2281,16 +2281,16 @@ syn keyword ngxThirdPartyLuaBlock ssl_session_store_by_lua_block contained
 " Subtype needs to be set to '', otherwise recursive errors occur when opening *.nginx files
 let b:eruby_subtype = ''
 unlet b:current_syntax
-syn include @ERB syntax/eruby.vim
+syn include @ERB syntax/eruby.mnv
 syn region ngxTemplate start=+<%[^\=]+ end=+%>+ oneline contains=@ERB
 syn region ngxTemplateVar start=+<%=+ end=+%>+ oneline
 let b:current_syntax = "nginx"
 
 " Nested syntax in Jinja templating statements
-" This dependend on https://github.com/lepture/vim-jinja
+" This dependend on https://github.com/lepture/mnv-jinja
 unlet b:current_syntax
 try
-  syn include @JINJA syntax/jinja.vim
+  syn include @JINJA syntax/jinja.mnv
   syn region ngxTemplate start=+{%+ end=+%}+ oneline contains=@JINJA
   syn region ngxTemplateVar start=+{{+ end=+}}+ oneline
 catch
@@ -2299,7 +2299,7 @@ let b:current_syntax = "nginx"
 
 " Enable nested LUA syntax highlighting
 unlet b:current_syntax
-syn include @LUA syntax/lua.vim
+syn include @LUA syntax/lua.mnv
 syn region ngxLua start=+^\s*\w\+_by_lua_block\s*\(\$\w\+\s*\)\?{+ end=+}+me=s-1 contains=ngxBlock,@LUA
 let b:current_syntax = "nginx"
 
diff --git a/uvim/runtime/syntax/ninja.vim b/uvim/runtime/syntax/ninja.mnv
index a53567e585..d42eb67d90 100644
--- a/uvim/runtime/syntax/ninja.vim
+++ b/uvim/runtime/syntax/ninja.mnv
@@ -4,8 +4,8 @@
 " Version: 1.5
 " Last Change: 2018/04/05
 " Maintainer: Nicolas Weber <nicolasweber@gmx.de>
-" Version 1.5 of this script is in the upstream vim repository and will be
-" included in the next vim release. If you change this, please send your change
+" Version 1.5 of this script is in the upstream mnv repository and will be
+" included in the next mnv release. If you change this, please send your change
 " upstream.
 
 " ninja lexer and parser are at
@@ -17,7 +17,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/nix.vim b/uvim/runtime/syntax/nix.mnv
index ef52cddf46..5e5093d911 100644
--- a/uvim/runtime/syntax/nix.vim
+++ b/uvim/runtime/syntax/nix.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:        Nix
 " Maintainer:      James Fleming <james@electronic-quill.net>
 "                  (Github username: equill)
 " Original Author: Daiderd Jordan <daiderd@gmail.com>
-" Acknowledgement: Based on vim-nix maintained by Daiderd Jordan <daiderd@gmail.com>
-"                  https://github.com/LnL7/vim-nix
+" Acknowledgement: Based on mnv-nix maintained by Daiderd Jordan <daiderd@gmail.com>
+"                  https://github.com/LnL7/mnv-nix
 " License:         MIT
 " Last Change:     2023 Aug 19
 
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword nixBoolean     true false
 syn keyword nixNull        null
diff --git a/uvim/runtime/syntax/nosyntax.vim b/uvim/runtime/syntax/nosyntax.mnv
index a761d712b7..9bc16e0e16 100644
--- a/uvim/runtime/syntax/nosyntax.vim
+++ b/uvim/runtime/syntax/nosyntax.mnv
@@ -1,7 +1,7 @@
-" Vim syntax support file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax support file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " This file is used for ":syntax off".
 " It removes the autocommands and stops highlighting for all buffers.
@@ -11,7 +11,7 @@ if !has("syntax")
 endif
 
 " Remove all autocommands for the Syntax event.  This also avoids that
-" "syntax=foo" in a modeline triggers the SynSet() function of synload.vim.
+" "syntax=foo" in a modeline triggers the SynSet() function of synload.mnv.
 au! Syntax
 
 " remove all syntax autocommands and remove the syntax for each buffer
diff --git a/uvim/runtime/syntax/nqc.vim b/uvim/runtime/syntax/nqc.mnv
index d09c106f98..5eca627a25 100644
--- a/uvim/runtime/syntax/nqc.vim
+++ b/uvim/runtime/syntax/nqc.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	NQC - Not Quite C, for LEGO mindstorms
 "		NQC homepage: http://www.enteract.com/~dbaum/nqc/
 " Maintainer:	Stefan Scherer <stefan@enotes.de>
 " Last Change:	2001 May 10
-" URL:		http://www.enotes.de/twiki/pub/Home/LegoMindstorms/nqc.vim
+" URL:		http://www.enotes.de/twiki/pub/Home/LegoMindstorms/nqc.mnv
 " Filenames:	.nqc
 
 " quit when a syntax file was already loaded
@@ -362,4 +362,4 @@ hi def link nqcCppOut		Comment
 
 let b:current_syntax = "nqc"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/nroff.vim b/uvim/runtime/syntax/nroff.mnv
index fec966f334..ba4bfcd148 100644
--- a/uvim/runtime/syntax/nroff.vim
+++ b/uvim/runtime/syntax/nroff.mnv
@@ -1,4 +1,4 @@
-" VIM syntax file
+" MNV syntax file
 " Language:	nroff/groff
 " Maintainer:	John Marshall <jmarshall@hey.com>
 " Previous Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
@@ -11,7 +11,7 @@
 " TODO:
 "
 " * Write syntax highlighting files for the preprocessors,
-"	and integrate with nroff.vim.
+"	and integrate with nroff.mnv.
 "
 "
 " {{{1 Start syntax highlighting.
@@ -23,7 +23,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if exists("nroff_is_groff")
 	let b:nroff_is_groff = 1
@@ -234,4 +234,4 @@ let b:current_syntax = "nroff"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim600: set fdm=marker fdl=2:
+" mnv600: set fdm=marker fdl=2:
diff --git a/uvim/runtime/syntax/nsis.vim b/uvim/runtime/syntax/nsis.mnv
index 49fa17abf1..00c14d4e4c 100644
--- a/uvim/runtime/syntax/nsis.vim
+++ b/uvim/runtime/syntax/nsis.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		NSIS script, for version of NSIS 3.08 and later
 " Maintainer:		Ken Takata
-" URL:			https://github.com/k-takata/vim-nsis
+" URL:			https://github.com/k-takata/mnv-nsis
 " Previous Maintainer:	Alex Jakushev <Alex.Jakushev@kemek.lt>
 " Last Change:		2022-11-05
 
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/nu.vim b/uvim/runtime/syntax/nu.mnv
index 0d0c80ec32..38107eeefe 100644
--- a/uvim/runtime/syntax/nu.vim
+++ b/uvim/runtime/syntax/nu.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Nushell
 " Maintainer:	El Kasztano
-" URL:		https://github.com/elkasztano/nushell-syntax-vim
+" URL:		https://github.com/elkasztano/nushell-syntax-mnv
 " License:	MIT <https://opensource.org/license/mit>
 " Last Change:	2025 Sep 05
 
diff --git a/uvim/runtime/syntax/obj.vim b/uvim/runtime/syntax/obj.mnv
index df4dbca5d7..9ae189ec18 100644
--- a/uvim/runtime/syntax/obj.vim
+++ b/uvim/runtime/syntax/obj.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	3D wavefront's obj file
 " Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:	.obj (used in 3D)
@@ -80,4 +80,4 @@ hi def link objKeywords        Keyword
 
 let b:current_syntax = "obj"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/objc.vim b/uvim/runtime/syntax/objc.mnv
index 7c6e2d5128..85e388121d 100644
--- a/uvim/runtime/syntax/objc.vim
+++ b/uvim/runtime/syntax/objc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Objective-C
 " Maintainer:   Kazunobu Kuriyama <kazunobu.kuriyama@gmail.com>
 " Last Change:  2020 Jun 07
@@ -10,10 +10,10 @@ if exists("b:current_syntax")
 endif
 if &filetype != 'objcpp'
   syn clear
-  runtime! syntax/c.vim
+  runtime! syntax/c.mnv
 endif
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 """ ObjC proper stuff follows...
 
@@ -531,4 +531,4 @@ let b:current_syntax = "objc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=2 sts=2
+" mnv: ts=8 sw=2 sts=2
diff --git a/uvim/runtime/syntax/objcpp.vim b/uvim/runtime/syntax/objcpp.mnv
index f11e307444..74ea69ec5d 100644
--- a/uvim/runtime/syntax/objcpp.vim
+++ b/uvim/runtime/syntax/objcpp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	    Objective C++
 " Maintainer:	    Kazunobu Kuriyama <kazunobu.kuriyama@nifty.com>
 " Ex-Maintainer:    Anthony Hodsdon <ahodsdon@fastmail.fm>
@@ -10,9 +10,9 @@ if exists("b:current_syntax")
 endif
 
 " Read in C++ and ObjC syntax files
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 unlet b:current_syntax
-runtime! syntax/objc.vim
+runtime! syntax/objc.mnv
 
 syn keyword objCppNonStructure    class template namespace transparent contained
 syn keyword objCppNonStatement    new delete friend using transparent contained
diff --git a/uvim/runtime/syntax/obse.vim b/uvim/runtime/syntax/obse.mnv
index 4ff04281f3..bb834bef78 100644
--- a/uvim/runtime/syntax/obse.vim
+++ b/uvim/runtime/syntax/obse.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Oblivion Language (obl)
 " Original Creator: Ulthar Seramis
 " Maintainer: Kat <katisntgood@gmail.com>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " obse is case insensitive
 syntax case ignore
diff --git a/uvim/runtime/syntax/ocaml.vim b/uvim/runtime/syntax/ocaml.mnv
index 04ba39203d..178685dd09 100644
--- a/uvim/runtime/syntax/ocaml.vim
+++ b/uvim/runtime/syntax/ocaml.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     OCaml
 " Filenames:    *.ml *.mli *.mll *.mly
 " Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
 "               Karl-Heinz Sylla  <Karl-Heinz.Sylla@gmd.de>
 "               Issac Trotts      <ijtrotts@ucdavis.edu>
-" URL:          https://github.com/ocaml/vim-ocaml
+" URL:          https://github.com/ocaml/mnv-ocaml
 " Last Change:
 "               2019 Nov 05 - Accurate type highlighting (Maëlan)
 "               2018 Nov 08 - Improved highlighting of operators (Maëlan)
@@ -25,7 +25,7 @@ if exists("b:current_syntax") && b:current_syntax == "ocaml"
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " ' can be used in OCaml identifiers
 setlocal iskeyword+='
@@ -665,4 +665,4 @@ let b:current_syntax = "ocaml"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/occam.vim b/uvim/runtime/syntax/occam.mnv
index 01d139bd09..de6e78029e 100644
--- a/uvim/runtime/syntax/occam.vim
+++ b/uvim/runtime/syntax/occam.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	occam
 " Copyright:	Fred Barnes <frmb2@kent.ac.uk>, Mario Schweigler <ms44@kent.ac.uk>
 " Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
diff --git a/uvim/runtime/syntax/odin.vim b/uvim/runtime/syntax/odin.mnv
index efa107b79f..56c2959df7 100644
--- a/uvim/runtime/syntax/odin.vim
+++ b/uvim/runtime/syntax/odin.mnv
@@ -1,9 +1,9 @@
-vim9script
+mnv9script
 
-# Vim syntax file
+# MNV syntax file
 # Language: Odin
 # Maintainer: Maxim Kim <habamax@gmail.com>
-# Website: https://github.com/habamax/vim-odin
+# Website: https://github.com/habamax/mnv-odin
 # Last Change: 2026-02-02
 
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/omnimark.vim b/uvim/runtime/syntax/omnimark.mnv
index 9b12d5ecdd..372a7d9d8f 100644
--- a/uvim/runtime/syntax/omnimark.vim
+++ b/uvim/runtime/syntax/omnimark.mnv
@@ -1,10 +1,10 @@
-vim9script
-# Vim syntax file
+mnv9script
+# MNV syntax file
 # Language:    OmniMark
 # Maintainer:  Peter Kenny <kennypete.t2o3y@aleeas.com>
 # Previous Maintainer: Paul Terray <mailto:terray@4dconcept.fr>
 # Last Change: 2025-03-23
-# License:     Vim (see :help license)
+# License:     MNV (see :help license)
 # History:     2000-10-11 Vintage minimal syntax file (Paul Terray)
 #
 # - Syntax is grouped, generally, by type (action to rule), using the
@@ -830,4 +830,4 @@ highlight default link omnimarkNormal		Statement
 # }}}
 syntax sync fromstart
 b:current_syntax = "omnimark"
-# vim: cc=+1 et fdm=marker ft=vim sta sw=2 ts=8 tw=79
+# mnv: cc=+1 et fdm=marker ft=mnv sta sw=2 ts=8 tw=79
diff --git a/uvim/runtime/syntax/ondir.vim b/uvim/runtime/syntax/ondir.mnv
index 4aeb014e1b..1806051408 100644
--- a/uvim/runtime/syntax/ondir.vim
+++ b/uvim/runtime/syntax/ondir.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     ondir <https://github.com/alecthomas/ondir>
 " Maintainer:   Jon Parise <jon@indelible.org>
 
@@ -7,7 +7,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 syn case match
 
@@ -17,7 +17,7 @@ syn keyword ondirKeyword  enter leave contained skipwhite nextgroup=ondirPath
 syn match   ondirPath     "[^:]\+" contained display
 syn match   ondirColon    ":" contained display
 
-syn include @ondirShell   syntax/sh.vim
+syn include @ondirShell   syntax/sh.mnv
 syn region  ondirContent  start="^\s\+" end="^\ze\S.*$" keepend contained contains=@ondirShell
 
 syn region  ondirSection  start="^\(final\|enter\|leave\)" end="^\ze\S.*$" fold contains=ondirKeyword,ondirPath,ondirColon,ondirContent
@@ -32,4 +32,4 @@ let b:current_syntax = 'ondir'
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
 
-" vim: et ts=4 sw=2 sts=2:
+" mnv: et ts=4 sw=2 sts=2:
diff --git a/uvim/runtime/syntax/opam.vim b/uvim/runtime/syntax/opam.mnv
index da296627e5..520c72bb6f 100644
--- a/uvim/runtime/syntax/opam.vim
+++ b/uvim/runtime/syntax/opam.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    opam - OCaml package manager
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
-" URL:         https://github.com/ocaml/vim-ocaml
+" URL:         https://github.com/ocaml/mnv-ocaml
 " Last Change:
 "              2020 Dec 31 - Added header (Markus Mottl)
 
@@ -71,4 +71,4 @@ hi link opamUnclosedInterpolate Error
 
 let b:current_syntax = "opam"
 
-" vim: ts=2 sw=2
+" mnv: ts=2 sw=2
diff --git a/uvim/runtime/syntax/opencl.vim b/uvim/runtime/syntax/opencl.mnv
index c237aa30f9..3dcf78a958 100644
--- a/uvim/runtime/syntax/opencl.vim
+++ b/uvim/runtime/syntax/opencl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenCL
 " Last Change:	2024 Nov 19
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
@@ -8,6 +8,6 @@ if exists("b:current_syntax")
 endif
 
 " TODO: support openCL specific keywords
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 
 let current_syntax = "opencl"
diff --git a/uvim/runtime/syntax/openroad.vim b/uvim/runtime/syntax/openroad.mnv
index e09f233647..7bca9cc4b7 100644
--- a/uvim/runtime/syntax/openroad.vim
+++ b/uvim/runtime/syntax/openroad.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		CA-OpenROAD
 " Maintainer:	Luis Moreno <lmoreno@eresmas.net>
 " Last change:	2001 Jun 12
diff --git a/uvim/runtime/syntax/openscad.vim b/uvim/runtime/syntax/openscad.mnv
index 1e20c743c4..f679e23c22 100644
--- a/uvim/runtime/syntax/openscad.vim
+++ b/uvim/runtime/syntax/openscad.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		OpenSCAD
 " Maintainer:	Niklas Adam <adam@oddodd.org>
 " Last change:	2022-04-15
 "
 "
-" From salkin-mada/openscad.nvim
-" Building on the work of Sirtaj Singh Kang and others for vim-openscad
+" From salkin-mada/openscad.nmnv
+" Building on the work of Sirtaj Singh Kang and others for mnv-openscad
 "
 
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/openvpn.vim b/uvim/runtime/syntax/openvpn.mnv
index 02fd24bf39..6c03f7ed99 100644
--- a/uvim/runtime/syntax/openvpn.vim
+++ b/uvim/runtime/syntax/openvpn.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenVPN
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.ovpn
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Options
 syntax match openvpnOption /^[a-z-]\+/
diff --git a/uvim/runtime/syntax/opl.vim b/uvim/runtime/syntax/opl.mnv
index 8b66a5b345..e6135e0909 100644
--- a/uvim/runtime/syntax/opl.vim
+++ b/uvim/runtime/syntax/opl.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OPL
 " Maintainer:	Czo <Olivier.Sirol@lip6.fr>
 " Last Change:	2012 Feb 03 by Thilo Six
-" $Id: opl.vim,v 1.1 2004/06/13 17:34:11 vimboss Exp $
+" $Id: opl.mnv,v 1.1 2004/06/13 17:34:11 mnvboss Exp $
 
 " Open Psion Language... (EPOC16/EPOC32)
 
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " case is not significant
 syn case ignore
@@ -86,4 +86,4 @@ let b:current_syntax = "opl"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/ora.vim b/uvim/runtime/syntax/ora.mnv
index ab091a2eee..cb59168154 100644
--- a/uvim/runtime/syntax/ora.vim
+++ b/uvim/runtime/syntax/ora.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Oracle config files (.ora) (Oracle 8i, ver. 8.1.5)
 " Maintainer:	Sandor Kopanyi <sandor.kopanyi@mailbox.hu>
 " Url:		<->
@@ -461,4 +461,4 @@ if main_syntax == 'ora'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/org.vim b/uvim/runtime/syntax/org.mnv
index f4e938f9ee..d9868e29ab 100644
--- a/uvim/runtime/syntax/org.vim
+++ b/uvim/runtime/syntax/org.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Org
 " Previous Maintainer:  Luca Saccarola <github.e41mv@aleeas.com>
 " Maintainer:   This runtime file is looking for a new maintainer.
@@ -69,4 +69,4 @@ syn region orgCodeBlock matchgroup=orgCodeBlockDelimiter start="\c^\s*#+BEGIN_SR
 highlight def link orgCodeBlock markdownCodeBlock
 highlight def link orgCodeBlockDelimiter orgCodeBlock
 
-" vim: ts=8 sts=2 sw=2 et
+" mnv: ts=8 sts=2 sw=2 et
diff --git a/uvim/runtime/syntax/pacmanlog.vim b/uvim/runtime/syntax/pacmanlog.mnv
index 798b48f727..9d723702d8 100644
--- a/uvim/runtime/syntax/pacmanlog.vim
+++ b/uvim/runtime/syntax/pacmanlog.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language: pacman.log
 " Maintainer: Ronan Pigott <ronan@rjp.ie>
 " Last Change: 2023 Dec 04
-" 2025 Apr 16 by Vim Project (set 'cpoptions' for line continuation, #17121)
+" 2025 Apr 16 by MNV Project (set 'cpoptions' for line continuation, #17121)
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn sync maxlines=1
 syn region pacmanlogMsg start='\S' end='$' keepend contains=pacmanlogTransaction,pacmanlogALPMMsg
diff --git a/uvim/runtime/syntax/pamconf.vim b/uvim/runtime/syntax/pamconf.mnv
index 1b5f901348..83432e0b98 100644
--- a/uvim/runtime/syntax/pamconf.vim
+++ b/uvim/runtime/syntax/pamconf.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             pam(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Change:        2024/03/31
 " Changes By:		Haochen Tong
-" 			Vim Project for the @include syntax
+" 			MNV Project for the @include syntax
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let s:has_service_field = exists("b:pamconf_has_service_field")
       \ ? b:pamconf_has_service_field
diff --git a/uvim/runtime/syntax/pamenv.vim b/uvim/runtime/syntax/pamenv.mnv
index 90359daa61..79354e4d3f 100644
--- a/uvim/runtime/syntax/pamenv.vim
+++ b/uvim/runtime/syntax/pamenv.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             pam_env.conf(5) configuration file
 " Latest Revision:      2020-05-10
 
diff --git a/uvim/runtime/syntax/pandoc.vim b/uvim/runtime/syntax/pandoc.mnv
index fdbdde096f..9c67604fdb 100644
--- a/uvim/runtime/syntax/pandoc.vim
+++ b/uvim/runtime/syntax/pandoc.mnv
@@ -1,23 +1,23 @@
 scriptencoding utf-8
-" Vim syntax file
+" MNV syntax file
 " Language:	Pandoc (superset of Markdown)
 " Maintainer:	Felipe Morales <hel.sheep@gmail.com>
 " Maintainer:	Caleb Maclennan <caleb@alerque.com>
-" Upstream:	https://github.com/vim-pandoc/vim-pandoc-syntax/tree/ea3fc415784bdcbae7f0093b80070ca4ff9e44c8
+" Upstream:	https://github.com/mnv-pandoc/mnv-pandoc-syntax/tree/ea3fc415784bdcbae7f0093b80070ca4ff9e44c8
 " Contributor:	David Sanson <dsanson@gmail.com>
 "		Jorge Israel Peña <jorge.israel.p@gmail.com>
 "		Christian Brabandt @chrisbra
 " Original Author:	Jeremy Schultz <taozhyn@gmail.com>
 " Version: 5.0
 " Last Change:	2024 Apr 08
-" 2025 Jun 27 by Vim project: sync with upstream (#17598)
+" 2025 Jun 27 by MNV project: sync with upstream (#17598)
 
 if exists('b:current_syntax')
   finish
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Configuration: {{{1
 "
@@ -101,7 +101,7 @@ if !exists('g:pandoc#syntax#codeblocks#embeds#use')
 endif
 " }}}2
 
-" for what languages and using what vim syntax files highlight those embeds. {{{2
+" for what languages and using what mnv syntax files highlight those embeds. {{{2
 " defaults to None.
 if !exists('g:pandoc#syntax#codeblocks#embeds#langs')
     let g:pandoc#syntax#codeblocks#embeds#langs = []
@@ -170,7 +170,7 @@ function! EnableEmbedsforCodeblocksWithLang(entry)
         let s:langname = matchstr(a:entry, '^[^=]*')
         let s:langsyntaxfile = matchstr(a:entry, '[^=]*$')
         unlet! b:current_syntax
-        exe 'syn include @'.toupper(s:langname).' syntax/'.s:langsyntaxfile.'.vim'
+        exe 'syn include @'.toupper(s:langname).' syntax/'.s:langsyntaxfile.'.mnv'
         " We might have just turned off spellchecking by including the file,
         " so we turn it back on here.
         exe 'syntax spell toplevel'
@@ -240,7 +240,7 @@ endif
 
 " HTML: {{{3
 " Set embedded HTML highlighting
-syn include @HTML syntax/html.vim
+syn include @HTML syntax/html.mnv
 syn match pandocHTML /<\/\?\a\_.\{-}>/ contains=@HTML
 " Support HTML multi line comments
 syn region pandocHTMLComment start=/<!--\s\=/ end=/\s\=-->/ keepend contains=pandocHTMLCommentStart,pandocHTMLCommentEnd
@@ -252,7 +252,7 @@ call s:WithConceal('html_c_e', 'syn match pandocHTMLCommentEnd /-->/ contained',
 " Set embedded LaTex (pandoc extension) highlighting
 " Unset current_syntax so the 2nd include will work
 unlet b:current_syntax
-syn include @LATEX syntax/tex.vim
+syn include @LATEX syntax/tex.mnv
 if index(g:pandoc#syntax#conceal#blacklist, 'inlinemath') == -1
     " Can't use WithConceal here because it will mess up all other conceals
     " when dollar signs are used normally. It must be skipped entirely if
@@ -267,7 +267,7 @@ syn region pandocLaTeXMathBlock start=/\$\$/ end=/\$\$/ keepend contains=@LATEX
 syn region pandocLaTeXMathBlock start=/\\\@<!\\\[/ end=/\\\@<!\\\]/ keepend contains=@LATEX
 syn match pandocLaTeXCommand /\\[[:alpha:]]\+\(\({.\{-}}\)\=\(\[.\{-}\]\)\=\)*/ contains=@LATEX
 syn region pandocLaTeXRegion start=/\\begin{\z(.\{-}\)}/ end=/\\end{\z1}/ keepend contains=@LATEX
-" we rehighlight sectioning commands, because otherwise tex.vim captures all text until EOF or a new sectioning command
+" we rehighlight sectioning commands, because otherwise tex.mnv captures all text until EOF or a new sectioning command
 syn region pandocLaTexSection start=/\\\(part\|chapter\|\(sub\)\{,2}section\|\(sub\)\=paragraph\)\*\=\(\[.*\]\)\={/ end=/\}/ keepend
 syn match pandocLaTexSectionCmd /\\\(part\|chapter\|\(sub\)\{,2}section\|\(sub\)\=paragraph\)/ contained containedin=pandocLaTexSection
 syn match pandocLaTeXDelimiter /[[\]{}]/ contained containedin=pandocLaTexSection
@@ -451,7 +451,7 @@ syn match pandocCodePre /<code>.\{-}<\/code>/ skipnl
 " g:pandoc#syntax#codeblocks#embeds#langs *list*.
 "
 " entries in this list are the language code interpreted by pandoc,
-" if this differs from the name of the vim syntax file, append =vimname
+" if this differs from the name of the mnv syntax file, append =mnvname
 " e.g. let g:pandoc#syntax#codeblocks#embeds#langs = ["haskell", "literatehaskell=lhaskell"]
 "
 if g:pandoc#syntax#codeblocks#embeds#use != 0
@@ -562,7 +562,7 @@ syn match pandocAmpersandEscape /\v\&(#\d+|#x\x+|[[:alnum:]]+)\;/ contains=@NoSp
 " YAML: {{{2
 try
     unlet! b:current_syntax
-    syn include @YAML syntax/yaml.vim
+    syn include @YAML syntax/yaml.mnv
 catch /E484/
 endtry
 syn region pandocYAMLHeader start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=@YAML containedin=TOP
@@ -711,4 +711,4 @@ syntax sync minlines=1000
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
 
-" vim: set fdm=marker foldlevel=0:
+" mnv: set fdm=marker foldlevel=0:
diff --git a/uvim/runtime/syntax/papp.vim b/uvim/runtime/syntax/papp.mnv
index 5b65f05cf4..fa07db2947 100644
--- a/uvim/runtime/syntax/papp.vim
+++ b/uvim/runtime/syntax/papp.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file for the "papp" file format (_p_erl _app_lication)
+" MNV syntax file for the "papp" file format (_p_erl _app_lication)
 "
 " Language:	papp
 " Maintainer:	Marc Lehmann <pcg@goof.com>
@@ -20,16 +20,16 @@ if exists("b:current_syntax")
 endif
 
 " source is basically xml, with included html (this is common) and perl bits
-runtime! syntax/xml.vim
+runtime! syntax/xml.mnv
 unlet b:current_syntax
 
 if exists("papp_include_html")
-  syn include @PAppHtml syntax/html.vim
+  syn include @PAppHtml syntax/html.mnv
   unlet b:current_syntax
   syntax spell default  " added by Bram
 endif
 
-syn include @PAppPerl syntax/perl.vim
+syn include @PAppPerl syntax/perl.mnv
 
 syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
 
diff --git a/uvim/runtime/syntax/pascal.vim b/uvim/runtime/syntax/pascal.mnv
index 206df213a6..85d00d3998 100644
--- a/uvim/runtime/syntax/pascal.vim
+++ b/uvim/runtime/syntax/pascal.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Pascal
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainers:	Xavier Crégut <xavier.cregut@enseeiht.fr>
@@ -381,4 +381,4 @@ hi def link pascalShowTab		Error
 
 let b:current_syntax = "pascal"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet:
+" mnv: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/passwd.vim b/uvim/runtime/syntax/passwd.mnv
index ad90202b06..7acf67ea49 100644
--- a/uvim/runtime/syntax/passwd.vim
+++ b/uvim/runtime/syntax/passwd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             passwd(5) password file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-10-03
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   passwdBegin         display '^' nextgroup=passwdAccount
 
diff --git a/uvim/runtime/syntax/pbtxt.vim b/uvim/runtime/syntax/pbtxt.mnv
index 92a75560ef..ac9205498b 100644
--- a/uvim/runtime/syntax/pbtxt.vim
+++ b/uvim/runtime/syntax/pbtxt.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Protobuf Text Format
 " Maintainer:           Lakshay Garg <lakshayg@outlook.in>
 " Last Change:          2020 Nov 17
-" Homepage:             https://github.com/lakshayg/vim-pbtxt
+" Homepage:             https://github.com/lakshayg/mnv-pbtxt
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -41,4 +41,4 @@ let b:current_syntax = "pbtxt"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet
+" mnv: nowrap sw=2 sts=2 ts=8 noet
diff --git a/uvim/runtime/syntax/pcap.vim b/uvim/runtime/syntax/pcap.mnv
index e0eed633c1..da9ed8ad22 100644
--- a/uvim/runtime/syntax/pcap.vim
+++ b/uvim/runtime/syntax/pcap.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Config file:	printcap
 " Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int> (defunct)
 "		Modified by Bram
@@ -45,4 +45,4 @@ hi def link pcapComment Comment
 
 let b:current_syntax = "pcap"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pccts.vim b/uvim/runtime/syntax/pccts.mnv
index 780035798b..8a0b063004 100644
--- a/uvim/runtime/syntax/pccts.vim
+++ b/uvim/runtime/syntax/pccts.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PCCTS
 " Maintainer:	Scott Bigham <dsb@killerbunnies.org>
 " Last Change:	10 Aug 1999
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-syn include @cppTopLevel syntax/cpp.vim
+syn include @cppTopLevel syntax/cpp.mnv
 
 syn region pcctsAction matchgroup=pcctsDelim start="<<" end=">>?\=" contains=@cppTopLevel,pcctsRuleRef
 
@@ -86,4 +86,4 @@ hi def link pcctsSpecialChar	SpecialChar
 
 let b:current_syntax = "pccts"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pdf.vim b/uvim/runtime/syntax/pdf.mnv
index 86d80daa6a..4d7ef90c28 100644
--- a/uvim/runtime/syntax/pdf.vim
+++ b/uvim/runtime/syntax/pdf.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PDF
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.info>
 " Last Change:	2007 Dec 16
 
 if exists("b:current_syntax")
@@ -11,7 +11,7 @@ if !exists("main_syntax")
     let main_syntax = 'pdf'
 endif
 
-syn include @pdfXML syntax/xml.vim
+syn include @pdfXML syntax/xml.mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/perl.vim b/uvim/runtime/syntax/perl.mnv
index c5dced9b39..9f94dacb68 100644
--- a/uvim/runtime/syntax/perl.vim
+++ b/uvim/runtime/syntax/perl.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      Perl
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2022 Jun 13
 " Contributors:  Andy Lester <andy@petdance.com>
 "                Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
@@ -39,13 +39,13 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " POD starts with ^=<word> and ends with ^=cut
 
 if get(g:, 'perl_include_pod', 1)
   " Include a while extra syntax file
-  syn include @Pod syntax/pod.vim
+  syn include @Pod syntax/pod.mnv
   unlet b:current_syntax
   if get(g:, 'perl_fold', 1)
     syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,@Spell,perlTodo keepend fold extend
@@ -430,7 +430,7 @@ syn match  perlFormatField	"@$" contained
 
 " __END__ and __DATA__ clauses
 
-" Vim excludes empty syn-region end lines from the fold region.  This is
+" MNV excludes empty syn-region end lines from the fold region.  This is
 " probably a bug and means a DATA section ending with an empty line does not
 " have that final line included in the fold.
 "
@@ -442,8 +442,8 @@ syn match  perlFormatField	"@$" contained
 " This problem also exists with empty string delimited heredocs but there's no
 " known workaround for that case.
 if get(g:, 'perl_fold', 0)
-  syntax region perlDATA matchgroup=perlDATAStart start="^__DATA__$" end="VIM_PERL_EOF\%$" contains=@perlDATA fold
-  syntax region perlEND  matchgroup=perlENDStart  start="^__END__$"  end="VIM_PERL_EOF\%$" contains=@perlDATA fold
+  syntax region perlDATA matchgroup=perlDATAStart start="^__DATA__$" end="MNV_PERL_EOF\%$" contains=@perlDATA fold
+  syntax region perlEND  matchgroup=perlENDStart  start="^__END__$"  end="MNV_PERL_EOF\%$" contains=@perlDATA fold
 else
   syntax region perlDATA matchgroup=perlDATAStart start="^__DATA__$" end="\%$" contains=@perlDATA
   syntax region perlEND  matchgroup=perlENDStart  start="^__END__$"  end="\%$" contains=@perlDATA
@@ -505,7 +505,7 @@ else
 endif
 
 " NOTE: If you're linking new highlight groups to perlString, please also put
-"       them into b:match_skip in ftplugin/perl.vim.
+"       them into b:match_skip in ftplugin/perl.mnv.
 
 " The default highlighting.
 hi def link perlSharpBang		PreProc
@@ -609,7 +609,7 @@ hi def link perlENDStart		perlEND
 hi def link perlDATA			perlComment
 hi def link perlDATAStart		perlDATA
 
-" NOTE: Due to a bug in Vim (or more likely, a misunderstanding on my part),
+" NOTE: Due to a bug in MNV (or more likely, a misunderstanding on my part),
 "	I had to remove the transparent property from the following regions
 "	in order to get them to highlight correctly.  Feel free to remove
 "	these and reinstate the transparent property if you know how.
@@ -659,4 +659,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " XXX Change to sts=4:sw=4
-" vim:ts=8:sts=2:sw=2:expandtab:ft=vim
+" mnv:ts=8:sts=2:sw=2:expandtab:ft=mnv
diff --git a/uvim/runtime/syntax/pf.vim b/uvim/runtime/syntax/pf.mnv
index b928dc4fbb..b928dc4fbb 100644
--- a/uvim/runtime/syntax/pf.vim
+++ b/uvim/runtime/syntax/pf.mnv
diff --git a/uvim/runtime/syntax/pfmain.vim b/uvim/runtime/syntax/pfmain.mnv
index af58da70ef..6915b41692 100644
--- a/uvim/runtime/syntax/pfmain.vim
+++ b/uvim/runtime/syntax/pfmain.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Postfix main.cf configuration
 " Maintainer:	KELEMEN Peter <Peter dot Kelemen at cern dot ch>
 " Last Updates:	Anton Shestakov, Hong Xu
 " Last Change:	2015 Feb 10
 " Version:	0.40
-" URL:		http://cern.ch/fuji/vim/syntax/pfmain.vim
+" URL:		http://cern.ch/fuji/mnv/syntax/pfmain.mnv
 " Comment:	Based on Postfix 2.12/3.0 postconf.5.html.
 
 " quit when a syntax file was already loaded
@@ -1832,4 +1832,4 @@ hi def link pfmainSpecial	Special
 
 let b:current_syntax = "pfmain"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/php.vim b/uvim/runtime/syntax/php.mnv
index 80662d6750..921d26b9b9 100644
--- a/uvim/runtime/syntax/php.vim
+++ b/uvim/runtime/syntax/php.mnv
@@ -1,27 +1,27 @@
-" Vim syntax file
+" MNV syntax file
 " Language: php PHP 3/4/5/7/8
 " Maintainer: Tyson Andre <tysonandre775@hotmail.com>
 " Last Change: Sep 18, 2021
-" URL: https://github.com/TysonAndre/php-vim-syntax
+" URL: https://github.com/TysonAndre/php-mnv-syntax
 " Former Maintainers: 
 "         Jason Woofenden <jason@jasonwoof.com>
-"         Peter Hodge <toomuchphp-vim@yahoo.com>
-"         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
+"         Peter Hodge <toomuchphp-mnv@yahoo.com>
+"         Debian MNV Maintainers <pkg-mnv-maintainers@lists.alioth.debian.org>
 "
 " Note: If you are using a colour terminal with dark background, you will
 "       probably find the 'elflord' colorscheme is much better for PHP's syntax
 "       than the default colourscheme, because elflord's colours will better
 "       highlight the break-points (Statements) in your code.
 "
-" Note: This embeds a modified copy of the html.vim with (mostly) different symbols,
+" Note: This embeds a modified copy of the html.mnv with (mostly) different symbols,
 " in order to implement php_htmlInStrings=2 can work as expected and correctly parse
 " `<?php $phpStartTag = '<?php';`.
 "
-" Credits for the original version of html.vim prior to modifications
+" Credits for the original version of html.mnv prior to modifications
 "
 "   Previous Maintainer Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 "   Previous Maintainer Claudio Fleiner <claudio@fleiner.com>
-"   Repository          https://notabug.org/jorgesumle/vim-html-syntax
+"   Repository          https://notabug.org/jorgesumle/mnv-html-syntax
 "   Last Change         2021 Mar 02
 "			Included patch #7900 to fix comments
 "			Included patch #7916 to fix a few more things
@@ -85,7 +85,7 @@ if !exists("main_syntax")
 endif
 
 " Start of copy of html for embedding in strings with  {{{
-" This is a clone of https://notabug.org/jorgesumle/vim-html-syntax
+" This is a clone of https://notabug.org/jorgesumle/mnv-html-syntax
 " from 2021 Mar 02 with changed symbols and modifications to rules. See the Note in the file header.
 "
 " The default behavior of php_htmlInStrings causes a bug
@@ -97,7 +97,7 @@ endif
 " it would cause the html syntax rules to be embedded inside of the string
 " contents.
 " 
-" However, php.vim extends html.vim by allowing the php start tag to be
+" However, php.mnv extends html.mnv by allowing the php start tag to be
 " included, meaning that this is parsed as `<?php';`, i.e. the start of a
 " new string literal.
 " 
@@ -201,7 +201,7 @@ if exists("php_htmlInStrings") && php_htmlInStrings==2
   if main_syntax != 'java' || exists("javascript")
     " JAVA SCRIPT
     " For example, $phpVar = '<img onload="foo()" />';
-    syn include @phpInnerHtmlJavaScript syntax/javascript.vim
+    syn include @phpInnerHtmlJavaScript syntax/javascript.mnv
     unlet b:current_syntax
     syn region  phpInnerHtmlScriptTag     contained start=+<script+ end=+>+ fold contains=phpInnerHtmlTagN,phpInnerHtmlString,phpInnerHtmlArg,phpInnerHtmlValue,phpInnerHtmlTagError,phpInnerHtmlEvent
     hi def link phpInnerHtmlScriptTag phpInnerHtmlTag
@@ -292,7 +292,7 @@ if exists("php_htmlInStrings") && php_htmlInStrings==2
 endif
 
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 " accept old options
@@ -313,7 +313,7 @@ endif
 
 syn cluster htmlPreproc add=phpRegion,phpRegionAsp,phpRegionSc
 
-syn include @sqlTop syntax/sql.vim
+syn include @sqlTop syntax/sql.mnv
 syn sync clear
 unlet b:current_syntax
 syn cluster sqlTop remove=sqlString,sqlComment
@@ -331,7 +331,7 @@ endif
 
 " make sure we can use \ at the beginning of the line to do a continuation
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -975,4 +975,4 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sts=2 sw=2 expandtab
+" mnv: ts=8 sts=2 sw=2 expandtab
diff --git a/uvim/runtime/syntax/phtml.vim b/uvim/runtime/syntax/phtml.mnv
index 646129a20b..c8d440f4c1 100644
--- a/uvim/runtime/syntax/phtml.vim
+++ b/uvim/runtime/syntax/phtml.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " PHTML used to be the filetype for PHP 2.0.  Now everything is PHP.
 
 if !exists("b:current_syntax")
-  runtime! syntax/php.vim
+  runtime! syntax/php.mnv
 endif
diff --git a/uvim/runtime/syntax/pic.vim b/uvim/runtime/syntax/pic.mnv
index bcb01f4dbd..41133791e8 100644
--- a/uvim/runtime/syntax/pic.vim
+++ b/uvim/runtime/syntax/pic.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     PIC16F84 Assembler (Microchip's microcontroller)
 " Maintainer:   Aleksandar Veselinovic <aleksa@cs.cmu.com>
 " Last Change:  2003 May 11
-" URL:		http://galeb.etf.bg.ac.yu/~alexa/vim/syntax/pic.vim
+" URL:		http://galeb.etf.bg.ac.yu/~alexa/mnv/syntax/pic.mnv
 " Revision:     1.01
 
 " quit when a syntax file was already loaded
@@ -111,4 +111,4 @@ hi def link picIdentifier		Identifier
 
 let b:current_syntax = "pic"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pike.vim b/uvim/runtime/syntax/pike.mnv
index 2c34cb4f38..381f8db099 100644
--- a/uvim/runtime/syntax/pike.vim
+++ b/uvim/runtime/syntax/pike.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Pike
 " Maintainer:		Stephen R. van den Berg <srb@cuci.nl>
 " Maintainer of previous implementation: Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
@@ -16,14 +16,14 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " For multiline strings, try formatting them as SQL
-syn include @pikeSQL <sfile>:p:h/sqloracle.vim
+syn include @pikeSQL <sfile>:p:h/sqloracle.mnv
 unlet b:current_syntax
 
 " For embedded Autodoc documentation (WIP)
-syn include @pikeAutodoc <sfile>:p:h/autodoc.vim
+syn include @pikeAutodoc <sfile>:p:h/autodoc.mnv
 unlet b:current_syntax
 
 syn case match
@@ -383,4 +383,4 @@ let b:current_syntax = "pike"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pilrc.vim b/uvim/runtime/syntax/pilrc.mnv
index f0e5f9bbc7..712c6d5f74 100644
--- a/uvim/runtime/syntax/pilrc.vim
+++ b/uvim/runtime/syntax/pilrc.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	pilrc - a resource compiler for Palm OS development
 " Maintainer:	Brian Schau <brian@schau.com>
 " Last change:	2003 May 11
-" Available on:	http://www.schau.com/pilrcvim/pilrc.vim
+" Available on:	http://www.schau.com/pilrcmnv/pilrc.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -13,7 +13,7 @@ syn case ignore
 
 " Notes: TRANSPARENT, FONT and FONT ID are defined in the specials
 "	 section below.   Beware of the order of the specials!
-"	 Look in the syntax.txt and usr_27.txt files in vim\vim{version}\doc
+"	 Look in the syntax.txt and usr_27.txt files in mnv\mnv{version}\doc
 "	 directory for regexps etc.
 
 " Keywords - basic
diff --git a/uvim/runtime/syntax/pine.vim b/uvim/runtime/syntax/pine.mnv
index aadf50be15..0442c7bfaf 100644
--- a/uvim/runtime/syntax/pine.vim
+++ b/uvim/runtime/syntax/pine.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Pine (email program) run commands
 " Maintainer:	David Pascoe <pascoedj@spamcop.net>
 " Last Change:	Thu Feb 27 10:18:48 WST 2003, update for pine 4.53
@@ -352,4 +352,4 @@ hi def link pineOption	Macro
 
 let b:current_syntax = "pine"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pinfo.vim b/uvim/runtime/syntax/pinfo.mnv
index cb9e60ebb3..2cbd7fa744 100644
--- a/uvim/runtime/syntax/pinfo.vim
+++ b/uvim/runtime/syntax/pinfo.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             pinfo(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/pkl.vim b/uvim/runtime/syntax/pkl.mnv
index 3565082cd2..802de45055 100644
--- a/uvim/runtime/syntax/pkl.vim
+++ b/uvim/runtime/syntax/pkl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		PKL
 " Maintainer:		Jan Claußen <jan DOT claussen10 AT web DOT de>
 " Last Change:		2025 Sep 24
@@ -9,7 +9,7 @@ endif
 
 " We use line-continuation here
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Needed to properly highlight multiline strings
 syn sync fromstart
diff --git a/uvim/runtime/syntax/plaintex.vim b/uvim/runtime/syntax/plaintex.mnv
index 5cb49a0bfc..2518e9286d 100644
--- a/uvim/runtime/syntax/plaintex.vim
+++ b/uvim/runtime/syntax/plaintex.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             TeX (plain.tex format)
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-10-26
@@ -8,12 +8,12 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   plaintexControlSequence         display contains=@NoSpell
       \ '\\[a-zA-Z@]\+'
 
-runtime! syntax/initex.vim
+runtime! syntax/initex.mnv
 unlet b:current_syntax
 
 syn match   plaintexComment                 display
diff --git a/uvim/runtime/syntax/pli.vim b/uvim/runtime/syntax/pli.mnv
index a274cc40bf..c322efe101 100644
--- a/uvim/runtime/syntax/pli.vim
+++ b/uvim/runtime/syntax/pli.mnv
@@ -1,5 +1,5 @@
-" Vim syntax file
-" Modified from  http://plnet.org/files/vim/
+" MNV syntax file
+" Modified from  http://plnet.org/files/mnv/
 " using keywords from http://www.kednos.com/pli/docs/reference_manual/6291pro_contents.html
 "    2012-11-13 Alan Thompson
 
diff --git a/uvim/runtime/syntax/plm.vim b/uvim/runtime/syntax/plm.mnv
index c6618adacb..3a5d1f8265 100644
--- a/uvim/runtime/syntax/plm.vim
+++ b/uvim/runtime/syntax/plm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PL/M
 " Maintainer:	Philippe Coulonges <cphil@cphil.net>
 " Last change:	2003 May 11
@@ -130,5 +130,5 @@ hi def link plmComment			Comment
 
 let b:current_syntax = "plm"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
 
diff --git a/uvim/runtime/syntax/plp.vim b/uvim/runtime/syntax/plp.mnv
index 48dc4b249e..f48e452d67 100644
--- a/uvim/runtime/syntax/plp.vim
+++ b/uvim/runtime/syntax/plp.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PLP (Perl in HTML)
 " Maintainer:	Juerd <juerd@juerd.nl>
 " Last Change:	2003 Apr 25
-" Cloned From:	aspperl.vim
+" Cloned From:	aspperl.mnv
 
-" Add to filetype.vim the following line (without quote sign):
+" Add to filetype.mnv the following line (without quote sign):
 " au BufNewFile,BufRead *.plp setf plp
 
 " quit when a syntax file was already loaded
@@ -16,9 +16,9 @@ if !exists("main_syntax")
   let main_syntax = 'perlscript'
 endif
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
-syn include @PLPperl syntax/perl.vim
+syn include @PLPperl syntax/perl.mnv
 
 syn cluster htmlPreproc add=PLPperlblock
 
diff --git a/uvim/runtime/syntax/plsql.vim b/uvim/runtime/syntax/plsql.mnv
index 7e44e83334..a5b9ab0040 100644
--- a/uvim/runtime/syntax/plsql.vim
+++ b/uvim/runtime/syntax/plsql.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Oracle Procedural SQL (PL/SQL)
 " Maintainer: Lee Lindley (lee dot lindley at gmail dot com)
 " Previous Maintainer: Jeff Lanzarotta (jefflanzarotta at yahoo dot com)
 " Previous Maintainer: C. Laurence Gonsalves (clgonsal@kami.com)
-" URL: https://github.com/lee-lindley/vim_plsql_syntax
+" URL: https://github.com/lee-lindley/mnv_plsql_syntax
 " Last Change: Mar 09, 2025   
 " History  Carsten Czarski (carsten dot czarski at oracle com)
 "               add handling for typical SQL*Plus commands (rem, start, host, set, etc)
@@ -31,7 +31,7 @@
 "  do not put the method name on the END statement)
 " let plsql_disable_procedure_fold = 1
 "
-"     From my vimrc file -- turn syntax and syntax folding on,
+"     From my mnvrc file -- turn syntax and syntax folding on,
 "     associate file suffixes as plsql, open all the folds on file open
 " syntax enable
 " let plsql_fold = 1
@@ -47,7 +47,7 @@ endif
 
 " this file uses line continuations
 let s:cpo_sav = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Todo.
 syn keyword plsqlTodo TODO FIXME XXX DEBUG NOTE
@@ -656,7 +656,7 @@ syn match plsqlAttribute "%\(BULK_EXCEPTIONS\|BULK_ROWCOUNT\|ISOPEN\|FOUND\|NOTF
 syn cluster plsqlParenGroup contains=plsqlParenError,@plsqlCommentGroup,plsqlCommentSkip,plsqlIntLiteral,plsqlFloatLiteral,plsqlNumbersCom
 
 if get(g:,"plsql_bracket_error",0) == 1
-    " I suspect this code was copied from c.vim and never properly considered. Do
+    " I suspect this code was copied from c.mnv and never properly considered. Do
     " we even use braces or brackets in sql or pl/sql?
     if get(g:,"plsql_fold",0) == 1
         syn region plsqlParen start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket fold keepend extend transparent
@@ -859,4 +859,4 @@ let b:current_syntax = "plsql"
 let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
-" vim: ts=4 sw=4
+" mnv: ts=4 sw=4
diff --git a/uvim/runtime/syntax/po.vim b/uvim/runtime/syntax/po.mnv
index 25424e2fbc..76d35acd0a 100644
--- a/uvim/runtime/syntax/po.vim
+++ b/uvim/runtime/syntax/po.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	po (gettext)
 " Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
 " Last Change:	2024 Nov 28
@@ -7,14 +7,14 @@
 "               Nam SungHyun <namsh@kldp.org> (Original maintainer)
 "               Eisuke Kawashima (add format-flags: #16132)
 " Last Change:
-" 2026 Mar 02 by Vim Project, various syntax improvements #19548
+" 2026 Mar 02 by MNV Project, various syntax improvements #19548
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn sync minlines=10
 
@@ -168,4 +168,4 @@ let b:current_syntax = "po"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:set ts=8 sts=2 sw=2 noet:
+" mnv:set ts=8 sts=2 sw=2 noet:
diff --git a/uvim/runtime/syntax/pod.vim b/uvim/runtime/syntax/pod.mnv
index 16189611ff..4f7bcebfc5 100644
--- a/uvim/runtime/syntax/pod.vim
+++ b/uvim/runtime/syntax/pod.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      Perl POD format
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
 " Previously:    Scott Bigham <dsb@killerbunnies.org>
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2022 Jun 13
 
 " To add embedded POD documentation highlighting to your syntax file, add
 " the commands:
 "
-"   syn include @Pod <sfile>:p:h/pod.vim
+"   syn include @Pod <sfile>:p:h/pod.mnv
 "   syn region myPOD start="^=pod" start="^=head" end="^=cut" keepend contained contains=@Pod
 "
 " and add myPod to the contains= list of some existing region, probably a
@@ -26,9 +26,9 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-" TODO: add supported encodings when we can utilize better performing Vim 8 features
+" TODO: add supported encodings when we can utilize better performing MNV 8 features
 syn match podEncoding	"[0-9A-Za-z_-]\+" contained contains=@NoSpell
 
 " Text of a =head1, =head2 or =item command
@@ -219,4 +219,4 @@ let b:current_syntax = "pod"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker:
+" mnv: ts=8 fdm=marker:
diff --git a/uvim/runtime/syntax/poefilter.vim b/uvim/runtime/syntax/poefilter.mnv
index 6561f7a704..b267917ba7 100644
--- a/uvim/runtime/syntax/poefilter.vim
+++ b/uvim/runtime/syntax/poefilter.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PoE item filter
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.filter
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Comment
 syn keyword poefilterTodo TODO NOTE XXX contained
diff --git a/uvim/runtime/syntax/poke.vim b/uvim/runtime/syntax/poke.mnv
index 4a07a77d6c..101a3216a4 100644
--- a/uvim/runtime/syntax/poke.vim
+++ b/uvim/runtime/syntax/poke.mnv
@@ -13,7 +13,7 @@
 " You should have received a copy of the GNU General Public License
 " along with this program.  If not, see <http://www.gnu.org/licenses/>.
 "
-" Vim syntax file
+" MNV syntax file
 " Language: Poke
 " Maintainer: Matt Ihlenfield <mtihlenfield@protonmail.com>
 " Filenames: *.pk
diff --git a/uvim/runtime/syntax/postscr.vim b/uvim/runtime/syntax/postscr.mnv
index 8141a13a34..70c9829454 100644
--- a/uvim/runtime/syntax/postscr.vim
+++ b/uvim/runtime/syntax/postscr.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     PostScript - all Levels, selectable
 " Maintainer:   Mike Williams <mrmrdubya@gmail.com>
 " Filenames:    *.ps,*.eps
 " Last Change:  2nd July 2025
-" URL:          http://www.eandem.co.uk/mrw/vim
+" URL:          http://www.eandem.co.uk/mrw/mnv
 "
 " Options Flags:
 " postscr_level                 - language level to use for highlighting (1, 2, or 3)
@@ -777,4 +777,4 @@ endif
 
 let b:current_syntax = "postscr"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/pov.vim b/uvim/runtime/syntax/pov.mnv
index 87b2aa5804..8eb61fab1f 100644
--- a/uvim/runtime/syntax/pov.vim
+++ b/uvim/runtime/syntax/pov.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language: PoV-Ray(tm) 3.7 Scene Description Language
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2011-04-23
-" 2025 Apr 21 by Vim Project (deprecate render and statistics #17177)
+" 2025 Apr 21 by MNV Project (deprecate render and statistics #17177)
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/povini.vim b/uvim/runtime/syntax/povini.mnv
index ac1f87875e..f17261b73e 100644
--- a/uvim/runtime/syntax/povini.vim
+++ b/uvim/runtime/syntax/povini.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language: PoV-Ray(tm) 3.7 configuration/initialization files
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2011-04-24
-" Required Vim Version: 6.0
+" Required MNV Version: 6.0
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/ppd.vim b/uvim/runtime/syntax/ppd.mnv
index 6bd57f34e5..593034f2c4 100644
--- a/uvim/runtime/syntax/ppd.vim
+++ b/uvim/runtime/syntax/ppd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PPD (PostScript printer description) file
 " Maintainer:	Bjoern Jacke <bjacke@suse.de>
 " Last Change:	2001-10-06
@@ -32,4 +32,4 @@ hi def link ppdConstraints		Special
 
 let b:current_syntax = "ppd"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/ppwiz.vim b/uvim/runtime/syntax/ppwiz.mnv
index 514f8f36cc..faf7cc5e02 100644
--- a/uvim/runtime/syntax/ppwiz.vim
+++ b/uvim/runtime/syntax/ppwiz.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     PPWizard (preprocessor by Dennis Bareis)
 " Maintainer:   Stefan Schwarzer <s.schwarzer@ndh.net>
-" URL:			http://www.ndh.net/home/sschwarzer/download/ppwiz.vim
+" URL:			http://www.ndh.net/home/sschwarzer/download/ppwiz.mnv
 " Last Change:  2003 May 11
-" Filename:     ppwiz.vim
+" Filename:     ppwiz.mnv
 
 " Remove old syntax stuff
 " quit when a syntax file was already loaded
@@ -80,5 +80,5 @@ hi def link ppwizHTML     Type
 
 let b:current_syntax = "ppwiz"
 
-" vim: ts=4
+" mnv: ts=4
 
diff --git a/uvim/runtime/syntax/pq.vim b/uvim/runtime/syntax/pq.mnv
index 5778dbca4f..715fc983d1 100644
--- a/uvim/runtime/syntax/pq.vim
+++ b/uvim/runtime/syntax/pq.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Power Query M
 " Maintainer:   Anarion Dunedain <anarion80@gmail.com>
 " Last Change:
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 " There are Power Query functions with dot or hash in the name
 setlocal iskeyword+=.
@@ -334,4 +334,4 @@ let b:current_syntax = "pq"
 let &cpo = s:keepcpo
 unlet! s:keepcpo
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/prescribe.vim b/uvim/runtime/syntax/prescribe.mnv
index cd5ddbeedd..9aef07f578 100644
--- a/uvim/runtime/syntax/prescribe.vim
+++ b/uvim/runtime/syntax/prescribe.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Kyocera PreScribe2e
 " Maintainer:	Klaus Muth <klaus@hampft.de>
-" URL:          http://www.hampft.de/vim/syntax/prescribe.vim
+" URL:          http://www.hampft.de/mnv/syntax/prescribe.mnv
 " Last Change:	2005 Mar 04
 
 " quit when a syntax file was already loaded
@@ -53,4 +53,4 @@ hi def link prescribeComment		Comment
 
 let b:current_syntax = "prescribe"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/privoxy.vim b/uvim/runtime/syntax/privoxy.mnv
index b83ba4667b..934ff1e5f7 100644
--- a/uvim/runtime/syntax/privoxy.vim
+++ b/uvim/runtime/syntax/privoxy.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Privoxy actions file
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2026 Jan 07
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region privoxyActionsBlock matchgroup=privoxyBraces start="^\s*\zs{" end="}"
 	\ contains=@privoxyActionPrefix,privoxyLineContinuation
@@ -180,4 +180,4 @@ let b:current_syntax = "privoxy"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker
+" mnv: ts=8 fdm=marker
diff --git a/uvim/runtime/syntax/procmail.vim b/uvim/runtime/syntax/procmail.mnv
index 93f50fe9ef..39ce86013e 100644
--- a/uvim/runtime/syntax/procmail.vim
+++ b/uvim/runtime/syntax/procmail.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Procmail definition file
 " Maintainer:	Melchior FRANZ <mfranz@aon.at>
 " Last Change:	2003 Aug 14
@@ -51,4 +51,4 @@ hi def link procmailString String
 
 let b:current_syntax = "procmail"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/progress.vim b/uvim/runtime/syntax/progress.mnv
index deb8199b32..df34a2fef7 100644
--- a/uvim/runtime/syntax/progress.vim
+++ b/uvim/runtime/syntax/progress.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Progress 4GL
 " Filename extensions:	*.p (collides with Pascal),
 "			*.i (collides with assembler)
@@ -17,7 +17,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword=@,48-57,_,-,!,#,$,%
 
@@ -313,4 +313,4 @@ let b:current_syntax = "progress"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=8
+" mnv: ts=8 sw=8
diff --git a/uvim/runtime/syntax/prolog.vim b/uvim/runtime/syntax/prolog.mnv
index 93aba4dc19..87210f598e 100644
--- a/uvim/runtime/syntax/prolog.vim
+++ b/uvim/runtime/syntax/prolog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    PROLOG
 " Maintainer:  Anton Kochkov <anton.kochkov@gmail.com>
 " Last Change: 2021 Jan 05
@@ -115,4 +115,4 @@ endif
 
 let b:current_syntax = "prolog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/promela.vim b/uvim/runtime/syntax/promela.mnv
index add4514561..b90d8182cb 100644
--- a/uvim/runtime/syntax/promela.vim
+++ b/uvim/runtime/syntax/promela.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:			ProMeLa
 " Maintainer:		Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
 " First Release:	Mon Oct 16 08:49:46 CEST 2006
diff --git a/uvim/runtime/syntax/proto.vim b/uvim/runtime/syntax/proto.mnv
index 0d2d2f259e..594b32b052 100644
--- a/uvim/runtime/syntax/proto.vim
+++ b/uvim/runtime/syntax/proto.mnv
@@ -28,7 +28,7 @@
 " (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 " OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-" This is the Vim syntax file for Google Protocol Buffers as found at
+" This is the MNV syntax file for Google Protocol Buffers as found at
 " https://github.com/protocolbuffers/protobuf
 " Last update: 2020 Oct 29
 
diff --git a/uvim/runtime/syntax/protocols.vim b/uvim/runtime/syntax/protocols.mnv
index f31ca5a4b7..85fc29086c 100644
--- a/uvim/runtime/syntax/protocols.vim
+++ b/uvim/runtime/syntax/protocols.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             protocols(5) - Internet protocols definition file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   protocolsBegin    display '^'
                               \ nextgroup=protocolsName,protocolsComment
diff --git a/uvim/runtime/syntax/prql.vim b/uvim/runtime/syntax/prql.mnv
index 2a224cdf02..3bb6c4e2ae 100644
--- a/uvim/runtime/syntax/prql.vim
+++ b/uvim/runtime/syntax/prql.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     PRQL
 " Maintainer:   vanillajonathan
 " Last Change:  2025-03-07
@@ -14,7 +14,7 @@ endif
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword prqlBoolean      false true
 syn keyword prqlSelf         this that
@@ -175,4 +175,4 @@ let b:current_syntax = "prql"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2 sts=2 ts=8 noet:
+" mnv:set sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/ps1.vim b/uvim/runtime/syntax/ps1.mnv
index e8f6b2f8ed..6b74786a5e 100644
--- a/uvim/runtime/syntax/ps1.vim
+++ b/uvim/runtime/syntax/ps1.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Windows PowerShell
-" URL:         https://github.com/PProvost/vim-ps1
+" URL:         https://github.com/PProvost/mnv-ps1
 " Last Change: 2020 Nov 24
 "
 " The following settings are available for tuning syntax highlighting:
diff --git a/uvim/runtime/syntax/ps1xml.vim b/uvim/runtime/syntax/ps1xml.mnv
index 6ca9ed0d1b..592fe67c8f 100644
--- a/uvim/runtime/syntax/ps1xml.vim
+++ b/uvim/runtime/syntax/ps1xml.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Windows PowerShell
-" URL:         https://github.com/PProvost/vim-ps1
+" URL:         https://github.com/PProvost/mnv-ps1
 " Last Change: 2013 Jun 24
 
 if exists("b:current_syntax")
@@ -8,13 +8,13 @@ if exists("b:current_syntax")
 endif
 
 let s:ps1xml_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 doau syntax xml
 unlet b:current_syntax
 
 syn case ignore
-syn include @ps1xmlScriptBlock <sfile>:p:h/ps1.vim
+syn include @ps1xmlScriptBlock <sfile>:p:h/ps1.mnv
 unlet b:current_syntax
 
 syn region ps1xmlScriptBlock
diff --git a/uvim/runtime/syntax/psf.vim b/uvim/runtime/syntax/psf.mnv
index 0971fe96bf..2dfe803e50 100644
--- a/uvim/runtime/syntax/psf.vim
+++ b/uvim/runtime/syntax/psf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Software Distributor product specification file
 "		(POSIX 1387.2-1995).
 " Maintainer:	Rex Barzee <rex_barzee@hp.com>
@@ -84,7 +84,7 @@ hi def link psfComment      Comment
 
 
 " Long descriptions and copyrights confuse the syntax highlighting, so
-" force vim to backup at least 100 lines before the top visible line
+" force mnv to backup at least 100 lines before the top visible line
 " looking for a sync location.
 syn sync lines=100
 
diff --git a/uvim/runtime/syntax/psl.vim b/uvim/runtime/syntax/psl.mnv
index ff6e833bc2..665ae95b3e 100644
--- a/uvim/runtime/syntax/psl.vim
+++ b/uvim/runtime/syntax/psl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Property Specification Language (PSL)
 " Maintainer:	Daniel Kho <daniel.kho@logik.haus>
 " Last Changed:	2021 Apr 17 by Daniel Kho
@@ -9,11 +9,11 @@ if exists("b:current_syntax")
 endif
 
 " Read in VHDL syntax files
-runtime! syntax/vhdl.vim
+runtime! syntax/vhdl.mnv
 unlet b:current_syntax
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " case is not significant
 syn case	ignore
@@ -80,4 +80,4 @@ let b:current_syntax = "psl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/ptcap.vim b/uvim/runtime/syntax/ptcap.mnv
index 5db7bda896..f3204fe225 100644
--- a/uvim/runtime/syntax/ptcap.vim
+++ b/uvim/runtime/syntax/ptcap.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	printcap/termcap database
 " Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
-" URL:		http://folk.uio.no/hakonrk/vim/syntax/ptcap.vim
+" URL:		http://folk.uio.no/hakonrk/mnv/syntax/ptcap.mnv
 " Last Change:	2001 May 15
 
 " quit when a syntax file was already loaded
@@ -92,4 +92,4 @@ hi def link ptcapString		NONE
 
 let b:current_syntax = "ptcap"
 
-" vim: sts=4 sw=4 ts=8
+" mnv: sts=4 sw=4 ts=8
diff --git a/uvim/runtime/syntax/ptx.vim b/uvim/runtime/syntax/ptx.mnv
index 98de4ff6d3..421503283e 100644
--- a/uvim/runtime/syntax/ptx.vim
+++ b/uvim/runtime/syntax/ptx.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Nvidia PTX (Parallel Thread Execution)
 " Maintainer: Yinzuo Jiang <jiangyinzuo@foxmail.com>
 " Latest Revision: 2024-12-05
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax iskeyword .,_,a-z,48-57
 
diff --git a/uvim/runtime/syntax/purifylog.vim b/uvim/runtime/syntax/purifylog.mnv
index 2143d9fe28..3b3dbde2cc 100644
--- a/uvim/runtime/syntax/purifylog.vim
+++ b/uvim/runtime/syntax/purifylog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	purify log files
 " Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
 " Last Change:	2003 May 11
@@ -103,4 +103,4 @@ hi def link purifyLogFatal		Error
 
 let b:current_syntax = "purifylog"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/pymanifest.vim b/uvim/runtime/syntax/pymanifest.mnv
index 26bdf797e0..bdd0e2e064 100644
--- a/uvim/runtime/syntax/pymanifest.vim
+++ b/uvim/runtime/syntax/pymanifest.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	PyPA manifest
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	MANIFEST.in
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 syn iskeyword @,-
 
diff --git a/uvim/runtime/syntax/pyrex.vim b/uvim/runtime/syntax/pyrex.mnv
index b860658975..0e3d44ba7e 100644
--- a/uvim/runtime/syntax/pyrex.vim
+++ b/uvim/runtime/syntax/pyrex.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Pyrex
 " Maintainer:	Marco Barisione <marco.bari@people.it>
-" URL:		http://marcobari.altervista.org/pyrex_vim.html
+" URL:		http://marcobari.altervista.org/pyrex_mnv.html
 " Last Change:	2009 Nov 09
 
 " quit when a syntax file was already loaded
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the Python syntax to start with
-runtime! syntax/python.vim
+runtime! syntax/python.mnv
 unlet b:current_syntax
 
 " Pyrex extentions
@@ -32,7 +32,7 @@ syn clear   pythonInclude
 syn keyword pythonInclude     import
 syn match   pythonInclude     "from"
 
-" With "for[^:]*\zsfrom" VIM does not match "for" anymore, so
+" With "for[^:]*\zsfrom" MNV does not match "for" anymore, so
 " I used the slower "\@<=" form
 syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
 
diff --git a/uvim/runtime/syntax/python.vim b/uvim/runtime/syntax/python.mnv
index e483468995..bf47580a38 100644
--- a/uvim/runtime/syntax/python.vim
+++ b/uvim/runtime/syntax/python.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
 " Last Change:	2025 Sep 08
-" 2025 Sep 25 by Vim Project: fix wrong type highlighting #18394
-" 2025 Dec 03 by Vim Project: highlight t-strings #18679
-" 2026 Jan 26 by Vim Project: highlight constants #18922
-" 2026 Mar 11 by Vim Project: fix number performance #19630
+" 2025 Sep 25 by MNV Project: fix wrong type highlighting #18394
+" 2025 Dec 03 by MNV Project: highlight t-strings #18679
+" 2026 Jan 26 by MNV Project: highlight constants #18922
+" 2026 Mar 11 by MNV Project: fix number performance #19630
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "		Rob B
@@ -58,14 +58,14 @@ endif
 
 " Use of Python 2 and 3.5 or lower requested.
 if exists("python_use_python2_syntax")
-  runtime! syntax/python2.vim
+  runtime! syntax/python2.mnv
   finish
 endif
 
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if exists("python_no_doctest_highlight")
   let python_no_doctest_code_highlight = 1
@@ -458,4 +458,4 @@ let b:current_syntax = "python"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2 sts=2 ts=8 noet:
+" mnv:set sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/python2.vim b/uvim/runtime/syntax/python2.mnv
index a4a7a822ec..551c9ddb95 100644
--- a/uvim/runtime/syntax/python2.vim
+++ b/uvim/runtime/syntax/python2.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Python 2
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
 " Last Change:	2016 Oct 29
-" 2025 Jul 14 by Vim project: highlight unicode strings
-" 2025 Jul 15 by Vim project: highlight b-strings
+" 2025 Jul 14 by MNV project: highlight unicode strings
+" 2025 Jul 15 by MNV project: highlight b-strings
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "		Rob B
@@ -39,7 +39,7 @@
 "   let python_highlight_all = 1
 "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" NOTE: This file is a copy of the last commit of runtime/syntax/python.vim
+" NOTE: This file is a copy of the last commit of runtime/syntax/python.mnv
 " that still supported Python 2. There is support for Python 3, up to 3.5,
 " and it was kept in the file as is, because it supports the straddling code
 " (Python 2 and 3 compatible) better.
@@ -53,7 +53,7 @@ endif
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 if exists("python_no_doctest_highlight")
   let python_no_doctest_code_highlight = 1
@@ -375,4 +375,4 @@ let b:current_syntax = "python"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:set sw=2 sts=2 ts=8 noet:
+" mnv:set sw=2 sts=2 ts=8 noet:
diff --git a/uvim/runtime/syntax/qb64.vim b/uvim/runtime/syntax/qb64.mnv
index a777e14481..ea41fcbd39 100644
--- a/uvim/runtime/syntax/qb64.vim
+++ b/uvim/runtime/syntax/qb64.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	QB64
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 Jan 21
@@ -9,9 +9,9 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-" syn iskeyword set after sourcing of basic.vim
+" syn iskeyword set after sourcing of basic.mnv
 
 syn case ignore
 
@@ -307,7 +307,7 @@ endfor
 syn match qb64Underscore "\<_" contained conceal transparent
 
 " Source QuickBASIC syntax {{{1
-runtime! syntax/basic.vim
+runtime! syntax/basic.mnv
 
 " add after the BASIC syntax file is sourced so cluster already exists
 syn cluster basicStatements	add=qb64Statement,qb64Metacommand,qb64IfMetacommand
@@ -406,4 +406,4 @@ let b:current_syntax = "qb64"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/qf.vim b/uvim/runtime/syntax/qf.mnv
index 6038983a1b..8c077a555a 100644
--- a/uvim/runtime/syntax/qf.vim
+++ b/uvim/runtime/syntax/qf.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Quickfix window
-" Maintainer:		The Vim Project <https://github.com/vim/vim>
+" Maintainer:		The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:		2026 Jan 31
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -31,4 +31,4 @@ hi def link qfError		Error
 
 let b:current_syntax = "qf"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/qml.vim b/uvim/runtime/syntax/qml.mnv
index d6f2abec37..947ee1bece 100644
--- a/uvim/runtime/syntax/qml.vim
+++ b/uvim/runtime/syntax/qml.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     QML
 " Previous Maintainer: Peter Hoeg <peter@hoeg.com>
 " Maintainer:   Chase Knowlden <haroldknowlden@gmail.com>
@@ -18,7 +18,7 @@ if !exists("main_syntax")
   let main_syntax = 'qml'
 endif
 
-" Drop fold if it set but vim doesn't support it.
+" Drop fold if it set but mnv doesn't support it.
 if !has("folding")
   unlet! qml_fold
 endif
diff --git a/uvim/runtime/syntax/quake.vim b/uvim/runtime/syntax/quake.mnv
index 7db53106ad..418cc51b7e 100644
--- a/uvim/runtime/syntax/quake.vim
+++ b/uvim/runtime/syntax/quake.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Quake[1-3] configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-,+
 
diff --git a/uvim/runtime/syntax/quarto.vim b/uvim/runtime/syntax/quarto.mnv
index f83071dd7f..bc01036759 100644
--- a/uvim/runtime/syntax/quarto.vim
+++ b/uvim/runtime/syntax/quarto.mnv
@@ -1,15 +1,15 @@
 " Language: Quarto (Markdown with chunks of R, Python and other languages)
 " Maintainer: This runtime file is looking for a new maintainer.
 " Former Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Former Repository: https://github.com/jalvesaq/R-Vim-runtime
+" Former Repository: https://github.com/jalvesaq/R-MNV-runtime
 " Last Change: 2023 Feb 24  08:26AM
-"		2024 Feb 19 by Vim Project (announce adoption)
+"		2024 Feb 19 by MNV Project (announce adoption)
 "
-" The developers of tools for Quarto maintain Vim runtime files in their
+" The developers of tools for Quarto maintain MNV runtime files in their
 " Github repository and, if required, I will hand over the maintenance of
 " this script for them.
 
-runtime syntax/rmd.vim
+runtime syntax/rmd.mnv
 
 syn match quartoShortarg /\S\+/ contained
 syn keyword quartoShortkey var meta env pagebreak video include contained
diff --git a/uvim/runtime/syntax/r.vim b/uvim/runtime/syntax/r.mnv
index fa73194332..b122444037 100644
--- a/uvim/runtime/syntax/r.vim
+++ b/uvim/runtime/syntax/r.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	      R (GNU S)
 " Maintainer:	      This runtime file is looking for a new maintainer.
 " Former Maintainers: Jakson Aquino <jalvesaq@gmail.com>
 "                     Vaidotas Zemlys <zemlys@gmail.com>
 "                     Tom Payne <tom@tompayne.org>
 " Contributor:        Johannes Ranke <jranke@uni-bremen.de>
-" Former Repository:  https://github.com/jalvesaq/R-Vim-runtime
+" Former Repository:  https://github.com/jalvesaq/R-MNV-runtime
 " Filenames:          *.R *.r *.Rhistory *.Rt
 " Last Change:        2023 Dec 24  08:05AM
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 "
 " NOTE: The highlighting of R functions might be defined in
 " runtime files created by a filetype plugin, if installed.
@@ -276,9 +276,9 @@ syn match rBraceError "[)}]" contained
 syn match rCurlyError "[)\]]" contained
 syn match rParenError "[\]}]" contained
 
-" Use Nvim-R to highlight functions dynamically if it is installed
+" Use Nmnv-R to highlight functions dynamically if it is installed
 if !exists("g:r_syntax_fun_pattern")
-  let s:ff = split(substitute(globpath(&rtp, "R/functions.vim"), "functions.vim", "", "g"), "\n")
+  let s:ff = split(substitute(globpath(&rtp, "R/functions.mnv"), "functions.mnv", "", "g"), "\n")
   if len(s:ff) > 0
     let g:r_syntax_fun_pattern = 0
   else
@@ -286,13 +286,13 @@ if !exists("g:r_syntax_fun_pattern")
   endif
 endif
 
-" Only use Nvim-R to highlight functions if they should not be highlighted
+" Only use Nmnv-R to highlight functions if they should not be highlighted
 " according to a generic pattern
 if g:r_syntax_fun_pattern == 1
   syn match rFunction '[0-9a-zA-Z_\.]\+\s*\ze('
 else
-  " Nvim-R:
-  runtime R/functions.vim
+  " Nmnv-R:
+  runtime R/functions.mnv
 endif
 
 syn match rDollar display contained "\$"
@@ -385,4 +385,4 @@ endif
 
 let b:current_syntax="r"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/racc.vim b/uvim/runtime/syntax/racc.mnv
index 2d4c176eb7..c913b47838 100644
--- a/uvim/runtime/syntax/racc.vim
+++ b/uvim/runtime/syntax/racc.mnv
@@ -1,4 +1,4 @@
-" Vim default file
+" MNV default file
 " Language:             Racc input file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2008-06-22
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword raccTodo        contained TODO FIXME XXX NOTE
 
@@ -93,7 +93,7 @@ syn match   raccDelimiter   contained '[:|]'
 
 syn match   raccToken       contained '\<\u[A-Z0-9_]*\>'
 
-syn include @raccRuby       syntax/ruby.vim
+syn include @raccRuby       syntax/ruby.mnv
 
 syn region  raccAction      transparent matchgroup=raccDelimiter
                             \ start='{' end='}' contains=@raccRuby
diff --git a/uvim/runtime/syntax/racket.vim b/uvim/runtime/syntax/racket.mnv
index 1405e4b2d6..c12fe55dc2 100644
--- a/uvim/runtime/syntax/racket.vim
+++ b/uvim/runtime/syntax/racket.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Racket
 " Maintainer:           D. Ben Knoble <ben.knoble+github@gmail.com>
 " Previous Maintainer:  Will Langstroth <will@langstroth.com>
-" URL:                  https://github.com/benknoble/vim-racket
+" URL:                  https://github.com/benknoble/mnv-racket
 " Description:          Contains all of the keywords in #lang racket
 " Last Change:          2026 Jan 07
 
diff --git a/uvim/runtime/syntax/radiance.vim b/uvim/runtime/syntax/radiance.mnv
index c49e339a28..0605710441 100644
--- a/uvim/runtime/syntax/radiance.vim
+++ b/uvim/runtime/syntax/radiance.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Radiance Scene Description
 " Maintainer:   Georg Mischler <schorsch@schorsch.com>
 " Last change:  26. April. 2001
@@ -139,4 +139,4 @@ hi def link radianceTodo		Todo
 
 let b:current_syntax = "radiance"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/raku.vim b/uvim/runtime/syntax/raku.mnv
index c77dfb3a44..738a3e7fcd 100644
--- a/uvim/runtime/syntax/raku.vim
+++ b/uvim/runtime/syntax/raku.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      Raku
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
-" Homepage:      https://github.com/Raku/vim-raku
-" Bugs/requests: https://github.com/Raku/vim-raku/issues
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
+" Homepage:      https://github.com/Raku/mnv-raku
+" Bugs/requests: https://github.com/Raku/mnv-raku/issues
 " Last Change:   2021-04-16
 
 " Contributors:  Luke Palmer <fibonaci@babylonia.flatirons.org>
@@ -11,10 +11,10 @@
 "
 " This is a big undertaking.
 "
-" The ftdetect/raku.vim file in this repository takes care of setting the
+" The ftdetect/raku.mnv file in this repository takes care of setting the
 " right filetype for Raku files. To set it explicitly you can also add this
 " line near the bottom of your source file:
-"   # vim: filetype=raku
+"   # mnv: filetype=raku
 
 " TODO:
 "   * Go over the list of keywords/types to see what's deprecated/missing
@@ -23,7 +23,7 @@
 " If you want to have Pir code inside Q:PIR// strings highlighted, do:
 "   let raku_embedded_pir=1
 "
-" The above requires pir.vim, which you can find in Parrot's repository:
+" The above requires pir.mnv, which you can find in Parrot's repository:
 " https://github.com/parrot/parrot/tree/master/editor
 "
 " To highlight Perl 5 regexes (m:P5//):
@@ -32,7 +32,7 @@
 " To enable folding:
 "   let raku_fold=1
 
-if version < 704 | throw "raku.vim uses regex syntax which Vim <7.4 doesn't support. Try 'make fix_old_vim' in the vim-perl repository." | endif
+if version < 704 | throw "raku.mnv uses regex syntax which MNV <7.4 doesn't support. Try 'make fix_old_mnv' in the mnv-perl repository." | endif
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -42,7 +42,7 @@ elseif exists("b:current_syntax")
     finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Patterns which will be interpolated by the preprocessor (tools/preproc.pl):
 "
@@ -473,7 +473,7 @@ syn match rakuPairsQ_qqto "\%(\_s*:!\?\%([A-Za-z_\xC0-\xFF]\%([A-Za-z_\xC0-\xFF0
 
 
 if exists("raku_embedded_pir") || exists("raku_extended_all")
-    syn include @rakuPIR syntax/pir.vim
+    syn include @rakuPIR syntax/pir.mnv
     syn match rakuQuote_QPIR display "Q[A-Za-z(]\@!\%(\_s*:PIR\)\@=" nextgroup=rakuPairsQ_PIR skipwhite skipempty
     syn match rakuPairs_QPIR contained "\_s*:PIR" transparent skipwhite skipempty nextgroup=rakuStringQ_PIR
 endif
@@ -1968,4 +1968,4 @@ let b:current_syntax = "raku"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:ts=8:sts=4:sw=4:expandtab:ft=vim
+" mnv:ts=8:sts=4:sw=4:expandtab:ft=mnv
diff --git a/uvim/runtime/syntax/raml.vim b/uvim/runtime/syntax/raml.mnv
index 062a71c81b..062c26bd06 100644
--- a/uvim/runtime/syntax/raml.vim
+++ b/uvim/runtime/syntax/raml.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    RAML (RESTful API Modeling Language)
 " Maintainer:  Eric Hopkins <eric.on.tech@gmail.com>
-" URL:         https://github.com/in3d/vim-raml
-" License:     Same as Vim
+" URL:         https://github.com/in3d/mnv-raml
+" License:     Same as MNV
 " Last Change: 2018-11-03
 
 if exists("b:current_syntax")
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword ramlTodo            contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/rapid.vim b/uvim/runtime/syntax/rapid.mnv
index ba112d3aab..5f5d0a95f4 100644
--- a/uvim/runtime/syntax/rapid.vim
+++ b/uvim/runtime/syntax/rapid.mnv
@@ -1,4 +1,4 @@
-" ABB Rapid Command syntax file for Vim
+" ABB Rapid Command syntax file for MNV
 " Language: ABB Rapid Command
 " Maintainer: Patrick Meiser-Knosowski <knosowski@graeffrobotics.de>
 " Version: 2.3.0
@@ -33,7 +33,7 @@ elseif exists("b:current_syntax")
 endif
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " if colorscheme is tortus rapidNoHighLink defaults to 1
 if (get(g:,'colors_name'," ")=="tortus" || get(g:,'colors_name'," ")=="tortusless")
@@ -695,4 +695,4 @@ unlet s:keepcpo
 let b:current_syntax = "rapid"
 " }}} Finish
 
-" vim:sw=2 sts=2 et fdm=marker
+" mnv:sw=2 sts=2 et fdm=marker
diff --git a/uvim/runtime/syntax/rasi.vim b/uvim/runtime/syntax/rasi.mnv
index c4c4508f12..495f3edbc7 100644
--- a/uvim/runtime/syntax/rasi.vim
+++ b/uvim/runtime/syntax/rasi.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	rasi (Rofi Advanced Style Information)
 " Maintainer:	Pierrick Guillaume  <pierguill@gmail.com>
 " Last Change:	2024 May 21
-" 2025 Apr 16 by Vim Project (set 'cpoptions' for line continuation, #17121)
+" 2025 Apr 16 by MNV Project (set 'cpoptions' for line continuation, #17121)
 "
 " Syntax support for rasi config file
 
@@ -14,7 +14,7 @@ if exists('b:current_syntax')
 endif
 let b:current_syntax = 'rasi'
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " String {{{
 syn region rasiString    start=+"+ skip=+\\"+ end=+"+ oneline contained
@@ -301,4 +301,4 @@ hi def link rasiInvPropertyVal  rasiError
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/ratpoison.vim b/uvim/runtime/syntax/ratpoison.mnv
index 2322e856a4..c33f44a6e5 100644
--- a/uvim/runtime/syntax/ratpoison.vim
+++ b/uvim/runtime/syntax/ratpoison.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc )
 " Maintainer:	Magnus Woldrich <m@japh.se>
-" URL:		http://github.com/trapd00r/vim-syntax-ratpoison
+" URL:		http://github.com/trapd00r/mnv-syntax-ratpoison
 " Last Change:	2021-04-12 13:46:04
 " Previous Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
 
@@ -272,4 +272,4 @@ hi def link ratpoisonWinListArg	Constant
 
 let b:current_syntax = "ratpoison"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/rc.vim b/uvim/runtime/syntax/rc.mnv
index d69edd00fd..4bdf3fb46b 100644
--- a/uvim/runtime/syntax/rc.vim
+++ b/uvim/runtime/syntax/rc.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	M$ Resource files (*.rc)
 " Maintainer:	Christian Brabandt
 " Last Change:	20220116
-" Repository:   https://github.com/chrisbra/vim-rc-syntax
-" License:	Vim (see :h license)
+" Repository:   https://github.com/chrisbra/mnv-rc-syntax
+" License:	MNV (see :h license)
 " Previous Maintainer:	Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>
 
-" This file is based on the c.vim
+" This file is based on the c.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -188,4 +188,4 @@ hi def link rcStatement	Statement
 
 let b:current_syntax = "rc"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/rcs.vim b/uvim/runtime/syntax/rcs.mnv
index 5a34802ada..9d9c5375ba 100644
--- a/uvim/runtime/syntax/rcs.vim
+++ b/uvim/runtime/syntax/rcs.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     RCS file
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
-" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/rcs.vim
+" URL:          https://github.com/hdima/mnv-scripts/blob/master/syntax/rcs.mnv
 " Last Change:  2012-02-11
 " Filenames:    *,v
 " Version:      1.12
diff --git a/uvim/runtime/syntax/rcslog.vim b/uvim/runtime/syntax/rcslog.mnv
index 18f4593c77..3685f09f2e 100644
--- a/uvim/runtime/syntax/rcslog.vim
+++ b/uvim/runtime/syntax/rcslog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	RCS log output
 " Maintainer:	Joe Karthauser <joe@freebsd.org>
 " Last Change:	2001 May 09
@@ -22,4 +22,4 @@ hi def link rcslogDate		Identifier
 
 let b:current_syntax = "rcslog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/readline.vim b/uvim/runtime/syntax/readline.mnv
index 3831ae1149..08571fe290 100644
--- a/uvim/runtime/syntax/readline.vim
+++ b/uvim/runtime/syntax/readline.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             readline(3) configuration file
 " Maintainer:           Daniel Moch <daniel@danielmoch.com>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -11,7 +11,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-
 
diff --git a/uvim/runtime/syntax/rebol.vim b/uvim/runtime/syntax/rebol.mnv
index a5d50c4ab1..1c4ae0bcc9 100644
--- a/uvim/runtime/syntax/rebol.vim
+++ b/uvim/runtime/syntax/rebol.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Rebol
 " Maintainer:	Mike Williams <mrw@eandem.co.uk>
 " Filenames:	*.r
 " Last Change:	27th June 2002
-" URL:		http://www.eandem.co.uk/mrw/vim
+" URL:		http://www.eandem.co.uk/mrw/mnv
 "
 
 " quit when a syntax file was already loaded
@@ -196,4 +196,4 @@ endif
 
 let b:current_syntax = "rebol"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/redif.vim b/uvim/runtime/syntax/redif.mnv
index 365192284b..f8df7ac65f 100644
--- a/uvim/runtime/syntax/redif.vim
+++ b/uvim/runtime/syntax/redif.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:          ReDIF
 " Maintainer:        Axel Castellane <axel.castellane@polytechnique.edu>
 " Last Change:       2021 Jul 28
@@ -932,7 +932,7 @@ highlight redifFieldDeprecated term=undercurl cterm=undercurl gui=undercurl guis
 " Sync: The template-type (ReDIF-Paper, ReDIF-Archive, etc.) influences which
 " fields can follow. Thus sync must search backwards for it.
 "
-" I would like to simply ask VIM to search backward for the first occurrence of
+" I would like to simply ask MNV to search backward for the first occurrence of
 " /^Template-Type:/, but it does not seem to be possible, so I have to start
 " from the beginning of the file... This might slow down a lot for files that
 " contain a lot of Template-Type statements.
diff --git a/uvim/runtime/syntax/registry.vim b/uvim/runtime/syntax/registry.mnv
index 67b5e49bcb..190e151a02 100644
--- a/uvim/runtime/syntax/registry.vim
+++ b/uvim/runtime/syntax/registry.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Windows Registry export with regedit (*.reg)
 " Maintainer:	Dominique Stéphan (dominique@mggen.com)
-" URL: 		http://www.mggen.com/vim/syntax/registry.zip (doesn't work)
+" URL: 		http://www.mggen.com/mnv/syntax/registry.zip (doesn't work)
 " Last change:	2014 Oct 31
 "		Included patch from Alexander A. Ulitin
 
@@ -74,7 +74,7 @@ syn match  registrySubKey		"^@="
 " 9    REG_FULL_RESOURCE_DESCRIPTOR
 " 10   REG_RESOURCE_REQUIREMENTS_LIST
 " The value can take several lines, if \ ends the line
-" The limit to 999 matches is arbitrary, it avoids Vim crashing on a very long
+" The limit to 999 matches is arbitrary, it avoids MNV crashing on a very long
 " line of hex values that ends in a comma.
 "syn match registryHex		"hex\(([0-9]\{0,2})\)\=:\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$" contains=registrySpecial
 syn match registryHex		"hex\(([0-9]\{0,2})\)\=:\([0-9a-fA-F]\{2},\)*\([0-9a-fA-F]\{2}\|\\\)$" contains=registrySpecial
@@ -100,4 +100,4 @@ hi def link registryDword		Number
 
 let b:current_syntax = "registry"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/rego.vim b/uvim/runtime/syntax/rego.mnv
index bc82030488..2442b17535 100644
--- a/uvim/runtime/syntax/rego.vim
+++ b/uvim/runtime/syntax/rego.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: rego policy language
 " Maintainer: Matt Dunford (zenmatic@gmail.com)
-" URL:        https://github.com/zenmatic/vim-syntax-rego
+" URL:        https://github.com/zenmatic/mnv-syntax-rego
 " Last Change: 2022 Dec 4
 
 " https://www.openpolicyagent.org/docs/latest/policy-language/
diff --git a/uvim/runtime/syntax/remind.vim b/uvim/runtime/syntax/remind.mnv
index 9e7ff22e14..618f0247c4 100644
--- a/uvim/runtime/syntax/remind.vim
+++ b/uvim/runtime/syntax/remind.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Remind
 " Maintainer:	Davide Alberani <da@erlug.linux.it>
 " Last Change:	02 Nov 2015
 " Version:	0.7
-" URL:		http://ismito.it/vim/syntax/remind.vim
+" URL:		http://ismito.it/mnv/syntax/remind.mnv
 "
 " Remind is a sophisticated calendar and alarm program.
 " You can download remind from:
@@ -70,4 +70,4 @@ hi def link remindWarning		Error
 
 let b:current_syntax = "remind"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/requirements.vim b/uvim/runtime/syntax/requirements.mnv
index a87d1e9a39..54e2f3d0fb 100644
--- a/uvim/runtime/syntax/requirements.vim
+++ b/uvim/runtime/syntax/requirements.mnv
@@ -1,7 +1,7 @@
-" the Requirements File Format syntax support for Vim
+" the Requirements File Format syntax support for MNV
 " Version: 1.8.0
 " Author:  raimon <raimon49@hotmail.com>
-" Upstream: https://github.com/raimon49/requirements.txt.vim
+" Upstream: https://github.com/raimon49/requirements.txt.mnv
 " License: MIT LICENSE
 " The MIT License (MIT)
 "
@@ -64,4 +64,4 @@ hi def link requirementsEnvironmentMarkers Macro
 
 let b:current_syntax = "requirements"
 
-" vim: et sw=4 ts=4 sts=4:
+" mnv: et sw=4 ts=4 sts=4:
diff --git a/uvim/runtime/syntax/resolv.vim b/uvim/runtime/syntax/resolv.mnv
index 9a2dec51ce..9b77fa9f9f 100644
--- a/uvim/runtime/syntax/resolv.vim
+++ b/uvim/runtime/syntax/resolv.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: resolver configuration file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
-" URL: https://raw.github.com/rid9/vim-resolv/master/resolv.vim
+" URL: https://raw.github.com/rid9/mnv-resolv/master/resolv.mnv
 " Last Change: 2020 Mar 10
 " Version: 1.4
 "
@@ -116,4 +116,4 @@ hi def link resolvIPSpecial Special
 
 let b:current_syntax = "resolv"
 
-" vim: ts=8 ft=vim
+" mnv: ts=8 ft=mnv
diff --git a/uvim/runtime/syntax/reva.vim b/uvim/runtime/syntax/reva.mnv
index 74a399bcb4..803f44a675 100644
--- a/uvim/runtime/syntax/reva.vim
+++ b/uvim/runtime/syntax/reva.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Reva Forth
 " Version:	2011.2
 " Last Change:	2019 Sep 27
 " Maintainer:	Ron Aaron <ron@ronware.org>
 " URL:		https://github.com/ronaaron/reva
 " Filetypes:	*.rf *.frt
-" NOTE: 	You should also have the ftplugin/reva.vim file to set 'isk'
+" NOTE: 	You should also have the ftplugin/reva.mnv file to set 'isk'
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn clear
 
@@ -188,4 +188,4 @@ let b:current_syntax = "reva"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8:sw=4:nocindent:smartindent:
+" mnv: ts=8:sw=4:nocindent:smartindent:
diff --git a/uvim/runtime/syntax/rexx.vim b/uvim/runtime/syntax/rexx.mnv
index 360fc8ff9f..5c718154fc 100644
--- a/uvim/runtime/syntax/rexx.vim
+++ b/uvim/runtime/syntax/rexx.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Rexx
 " Maintainer:	Thomas Geulig <geulig@nentec.de>
 " Last Change:  2012 Sep 14, added support for new ooRexx 4.0 features
-" URL:		http://www.geulig.de/vim/rexx.vim
+" URL:		http://www.geulig.de/mnv/rexx.mnv
 " Special Thanks to Dan Sharp <dwsharp@hotmail.com> and Rony G. Flatscher
 " <Rony.Flatscher@wu-wien.ac.at> for comments and additions
 
@@ -206,7 +206,7 @@ syn region rexxVariable start="\zs\<\(\.\)\@!\K\k\+\>\ze\s*\(=\|,\|)\|%\|\]\|\\\
 syn match rexxVariable "\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)\s*\zs\K\k*\ze"
 
 " rgf, 2007-07-22: unfortunately, the entire region is colored (not only the
-" patterns), hence useless (vim 7.0)! (syntax-docs hint that that should work)
+" patterns), hence useless (mnv 7.0)! (syntax-docs hint that that should work)
 " attempt: just colorize the parenthesis in matching colors, keep content
 "          transparent to keep the formatting already done to it!
 " TODO: test on 7.3
@@ -315,4 +315,4 @@ hi def link rexxForward2           rexxForward
 
 let b:current_syntax = "rexx"
 
-"vim: ts=8
+"mnv: ts=8
diff --git a/uvim/runtime/syntax/rhelp.vim b/uvim/runtime/syntax/rhelp.mnv
index 7407538e4c..0893e335b6 100644
--- a/uvim/runtime/syntax/rhelp.vim
+++ b/uvim/runtime/syntax/rhelp.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    R Help File
 " Maintainer: This runtime file is looking for a new maintainer.
 " Former Maintainers: Jakson Aquino <jalvesaq@gmail.com>
 "                     Johannes Ranke <jranke@uni-bremen.de>
-" Former Repository: https://github.com/jalvesaq/R-Vim-runtime
+" Former Repository: https://github.com/jalvesaq/R-MNV-runtime
 " Last Change: 2016 Jun 28  08:53AM
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Remarks:     - Includes R syntax highlighting in the appropriate
-"                sections if an r.vim file is in the same directory or in the
+"                sections if an r.mnv file is in the same directory or in the
 "                default debian location.
 "              - There is no Latex markup in equations
 "              - Thanks to Will Gray for finding and fixing a bug
@@ -31,8 +31,8 @@ syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end="}" con
 syn region rhelpIdentifier matchgroup=rhelpSection start="\\Rdversion{" end="}"
 
 
-" Highlighting of R code using an existing r.vim syntax file if available {{{1
-syn include @R syntax/r.vim
+" Highlighting of R code using an existing r.mnv syntax file if available {{{1
+syn include @R syntax/r.mnv
 
 " Strings {{{1
 syn region rhelpString start=/"/ skip=/\\"/ end=/"/ contains=rhelpSpecialChar,rhelpCodeSpecial,rhelpLink contained
@@ -89,7 +89,7 @@ syn match rhelpMathOp  "+" contained
 syn match rhelpMathOp  "-" contained
 syn match rhelpMathOp  "=" contained
 
-" Conceal function based on syntax/tex.vim {{{2
+" Conceal function based on syntax/tex.mnv {{{2
 if exists("g:tex_conceal")
   let s:tex_conceal = g:tex_conceal
 else
@@ -273,4 +273,4 @@ hi def link rhelpMathOp      Operator
 
 let   b:current_syntax = "rhelp"
 
-" vim: foldmethod=marker sw=2
+" mnv: foldmethod=marker sw=2
diff --git a/uvim/runtime/syntax/rib.vim b/uvim/runtime/syntax/rib.mnv
index 0ee607122f..e772f4ab3c 100644
--- a/uvim/runtime/syntax/rib.vim
+++ b/uvim/runtime/syntax/rib.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Renderman Interface Bytestream
 " Maintainer:	Andrew Bromage <ajb@spamcop.net>
 " Last Change:	2003 May 11
@@ -59,4 +59,4 @@ hi def link ribFloat		Float
 
 let b:current_syntax = "rib"
 
-" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
+" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=mnv
diff --git a/uvim/runtime/syntax/rmd.vim b/uvim/runtime/syntax/rmd.mnv
index 4b4db1e783..067ce03d30 100644
--- a/uvim/runtime/syntax/rmd.vim
+++ b/uvim/runtime/syntax/rmd.mnv
@@ -1,14 +1,14 @@
 " Language: Markdown with chunks of R, Python and other languages
 " Maintainer: This runtime file is looking for a new maintainer.
 " Former Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Former Repository: https://github.com/jalvesaq/R-Vim-runtime
+" Former Repository: https://github.com/jalvesaq/R-MNV-runtime
 " Last Change: 2023 Dec 24  07:21AM
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 "
 "   For highlighting pandoc extensions to markdown like citations and TeX and
 "   many other advanced features like folding of markdown sections, it is
-"   recommended to install the vim-pandoc filetype plugin as well as the
-"   vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc.
+"   recommended to install the mnv-pandoc filetype plugin as well as the
+"   mnv-pandoc-syntax filetype plugin from https://github.com/mnv-pandoc.
 
 
 if exists("b:current_syntax")
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let g:rmd_include_latex = get(g:, 'rmd_include_latex', 1)
 if g:rmd_include_latex == 0 || g:rmd_include_latex == 1
@@ -29,7 +29,7 @@ endif
 let g:rmd_syn_hl_chunk = get(g:, 'rmd_syn_hl_chunk', 0)
 
 " Pandoc-syntax has more features, but it is slower.
-" https://github.com/vim-pandoc/vim-pandoc-syntax
+" https://github.com/mnv-pandoc/mnv-pandoc-syntax
 
 " Don't waste time loading syntax that will be discarded:
 let s:save_pandoc_lngs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', [])
@@ -37,8 +37,8 @@ let g:pandoc#syntax#codeblocks#embeds#langs = []
 
 let g:rmd_dynamic_fenced_languages = get(g:, 'rmd_dynamic_fenced_languages', v:true)
 
-" Step_1: Source pandoc.vim if it is installed:
-runtime syntax/pandoc.vim
+" Step_1: Source pandoc.mnv if it is installed:
+runtime syntax/pandoc.mnv
 if exists("b:current_syntax")
   if hlexists('pandocDelimitedCodeBlock')
     syn clear pandocDelimitedCodeBlock
@@ -51,7 +51,7 @@ if exists("b:current_syntax")
   " Recognize inline R code
   syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@Rmdr containedin=pandocLaTeXRegion,yamlFlowString keepend
 else
-  " Step_2: Source markdown.vim if pandoc.vim is not installed
+  " Step_2: Source markdown.mnv if pandoc.mnv is not installed
 
   " Configuration if not using pandoc syntax:
   " Add syntax highlighting of YAML header
@@ -71,7 +71,7 @@ else
   endif
   " Don't waste time loading syntax that will be discarded:
   let g:markdown_fenced_languages = []
-  runtime syntax/markdown.vim
+  runtime syntax/markdown.mnv
   if exists('s:save_mfl') > 0
     let g:markdown_fenced_languages = deepcopy(s:save_mfl)
     unlet s:save_mfl
@@ -81,7 +81,7 @@ else
   " Step_2a: Add highlighting for both YAML and citations which are pandoc
   " specific, but also used in Rmd files
 
-  " You don't need this if either your markdown/syntax.vim already highlights
+  " You don't need this if either your markdown/syntax.mnv already highlights
   " the YAML header or you are writing standard markdown
   if g:rmd_syn_hl_yaml
     " Basic highlighting of YAML header
@@ -111,10 +111,10 @@ else
     syn match rmdNewLine '  $' conceal cchar=↵
   endif
 
-  " You don't need this if either your markdown/syntax.vim already highlights
+  " You don't need this if either your markdown/syntax.mnv already highlights
   " citations or you are writing standard markdown
   if g:rmd_syn_hl_citations
-    " From vim-pandoc-syntax
+    " From mnv-pandoc-syntax
     " parenthetical citations
     syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
     " in-text citations with location
@@ -144,7 +144,7 @@ syn match knitrBodyVar '| \zs\S\{-}\ze:' contained containedin=knitrBodyOptions
 
 let g:rmd_fenced_languages = get(g:, 'rmd_fenced_languages', ['r'])
 
-let s:no_syntax_vim = []
+let s:no_syntax_mnv = []
 function s:IncludeLanguage(lng)
   if a:lng =~ '='
     let ftpy = substitute(a:lng, '.*=', '', '')
@@ -153,12 +153,12 @@ function s:IncludeLanguage(lng)
     let ftpy = a:lng
     let lnm  = a:lng
   endif
-  if index(s:no_syntax_vim, ftpy) >= 0
+  if index(s:no_syntax_mnv, ftpy) >= 0
     return
   endif
-  if len(globpath(&rtp, "syntax/" . ftpy . ".vim"))
+  if len(globpath(&rtp, "syntax/" . ftpy . ".mnv"))
     unlet! b:current_syntax
-    exe 'syn include @Rmd'.lnm.' syntax/'.ftpy.'.vim'
+    exe 'syn include @Rmd'.lnm.' syntax/'.ftpy.'.mnv'
     let b:current_syntax = "rmd"
     if g:rmd_syn_hl_chunk
       exe 'syn match knitrChunkDelim /```\s*{\s*'.lnm.'/ contained containedin=knitrChunkBrace contains=knitrChunkLabel'
@@ -175,7 +175,7 @@ function s:IncludeLanguage(lng)
     endif
   else
     " Avoid the cost of running globpath() whenever the buffer is saved
-    let s:no_syntax_vim += [ftpy]
+    let s:no_syntax_mnv += [ftpy]
   endif
 endfunction
 
@@ -188,8 +188,8 @@ let s:LaTeX_included = v:false
 function s:IncludeLaTeX()
   let s:LaTeX_included = v:true
   unlet! b:current_syntax
-  syn include @RmdLaTeX syntax/tex.vim
-  " From vim-pandoc-syntax
+  syn include @RmdLaTeX syntax/tex.mnv
+  " From mnv-pandoc-syntax
   syn region rmdLaTeXInlineMath start=/\v\\@<!\$\S@=/ end=/\v\\@<!\$\d@!/ keepend contains=@RmdLaTeX
   syn match rmdLaTeXCmd /\\[[:alpha:]]\+\(\({.\{-}}\)\=\(\[.\{-}\]\)\=\)*/ contains=@RmdLaTeX
   syn region rmdLaTeX start='\$\$'  end='\$\$' keepend contains=@RmdLaTeX
@@ -242,7 +242,7 @@ if g:rmd_dynamic_fenced_languages
   augroup END
 endif
 
-" Step_4: Highlight code recognized by pandoc but not defined in pandoc.vim yet:
+" Step_4: Highlight code recognized by pandoc but not defined in pandoc.mnv yet:
 syn match pandocDivBegin '^:::\+ {.\{-}}' contains=pandocHeaderAttr
 syn match pandocDivEnd '^:::\+$'
 
@@ -265,4 +265,4 @@ syntax iskeyword clear
 
 let b:current_syntax = "rmd"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/rnc.vim b/uvim/runtime/syntax/rnc.mnv
index 7d3907e991..2fa7a7f103 100644
--- a/uvim/runtime/syntax/rnc.vim
+++ b/uvim/runtime/syntax/rnc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Relax NG compact syntax
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-06-17
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 setlocal iskeyword+=-,.
 
diff --git a/uvim/runtime/syntax/rng.vim b/uvim/runtime/syntax/rng.mnv
index 1ef864c78f..542f5ebf8e 100644
--- a/uvim/runtime/syntax/rng.vim
+++ b/uvim/runtime/syntax/rng.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    RELAX NG
 " Maintainer:  Jaromir Hradilek <jhradilek@gmail.com>
-" URL:         https://github.com/jhradilek/vim-rng
+" URL:         https://github.com/jhradilek/mnv-rng
 " Last Change: 25 March 2013
 " Description: A syntax file for RELAX NG, a schema language for XML
 
diff --git a/uvim/runtime/syntax/rnoweb.vim b/uvim/runtime/syntax/rnoweb.mnv
index 749860a3fe..c58eaaa719 100644
--- a/uvim/runtime/syntax/rnoweb.vim
+++ b/uvim/runtime/syntax/rnoweb.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
 " Last Change: Thu Apr 05, 2018  11:06PM
 " Version:     0.9.1
 " Remarks:     - This file is inspired by the proposal of 
 "                Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
-"                http://www.ime.usp.br/~feferraz/en/sweavevim.html
+"                http://www.ime.usp.br/~feferraz/en/sweavemnv.html
 "
 
 if exists("b:current_syntax")
@@ -15,7 +15,7 @@ endif
 syn case match
 
 " Extension of Tex clusters {{{1
-runtime syntax/tex.vim
+runtime syntax/tex.mnv
 unlet! b:current_syntax
 
 syn cluster texMatchGroup add=@rnoweb
@@ -31,8 +31,8 @@ syn cluster texSubSectionGroup add=@rnoweb
 syn cluster texSubSubSectionGroup add=@rnoweb
 syn cluster texParaGroup add=@rnoweb
 
-" Highlighting of R code using an existing r.vim syntax file if available {{{1
-syn include @rnowebR syntax/r.vim
+" Highlighting of R code using an existing r.mnv syntax file if available {{{1
+syn include @rnowebR syntax/r.mnv
 syn region rnowebChunk matchgroup=rnowebDelimiter start="^\s*<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
 syn match rnowebChunkReference "^\s*<<.*>>$" contained
 syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR contained
@@ -49,4 +49,4 @@ hi def link rnowebSweaveOpts Statement
 hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
-" vim: foldmethod=marker:
+" mnv: foldmethod=marker:
diff --git a/uvim/runtime/syntax/robots.vim b/uvim/runtime/syntax/robots.mnv
index fcb9b0275d..8100e3de09 100644
--- a/uvim/runtime/syntax/robots.vim
+++ b/uvim/runtime/syntax/robots.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	"Robots.txt" files
 " Robots.txt files indicate to WWW robots which parts of a web site should not be accessed.
 " Maintainer:	Dominique Stéphan (dominique@mggen.com)
-" URL: http://www.mggen.com/vim/syntax/robots.zip
+" URL: http://www.mggen.com/mnv/syntax/robots.zip
 " Last change:	2001 May 09
 
 " quit when a syntax file was already loaded
@@ -53,5 +53,5 @@ hi def link robotsString		String
 
 let b:current_syntax = "robots"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
 
diff --git a/uvim/runtime/syntax/routeros.vim b/uvim/runtime/syntax/routeros.mnv
index b6effc9b62..7a4116d49b 100644
--- a/uvim/runtime/syntax/routeros.vim
+++ b/uvim/runtime/syntax/routeros.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:        MikroTik RouterOS Script
 " Maintainer:      zainin <z@wintr.dev>
 " Original Author: ndbjorne @ MikroTik forums
diff --git a/uvim/runtime/syntax/rpcgen.vim b/uvim/runtime/syntax/rpcgen.mnv
index e5a0b0b56f..49584f432b 100644
--- a/uvim/runtime/syntax/rpcgen.vim
+++ b/uvim/runtime/syntax/rpcgen.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	rpcgen
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Aug 31, 2016
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:	13
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_RPCGEN
 
 if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 
 syn keyword rpcProgram	program				skipnl skipwhite nextgroup=rpcProgName
 syn match   rpcProgName	contained	"\<\i\I*\>"	skipnl skipwhite nextgroup=rpcProgZone
@@ -45,4 +45,4 @@ endif
 
 let b:current_syntax = "rpcgen"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/rpl.vim b/uvim/runtime/syntax/rpl.mnv
index 28c250b7c4..ea949084f5 100644
--- a/uvim/runtime/syntax/rpl.vim
+++ b/uvim/runtime/syntax/rpl.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	RPL/2
 " Version:	0.15.15 against RPL/2 version 4.00pre7i
 " Last Change:	2012 Feb 03 by Thilo Six
 " Maintainer:	Joël BERTRAND <rpl2@free.fr>
-" URL:		http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim
+" URL:		http://www.makalis.fr/~bertrand/rpl2/download/mnv/indent/rpl.mnv
 " Credits:	Nothing
 
 " quit when a syntax file was already loaded
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Keyword characters (not used)
 " set iskeyword=33-127
@@ -480,4 +480,4 @@ let b:current_syntax = "rpl"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8 tw=132
+" mnv: ts=8 tw=132
diff --git a/uvim/runtime/syntax/rrst.vim b/uvim/runtime/syntax/rrst.mnv
index 3a56342cd8..fa5972a2f7 100644
--- a/uvim/runtime/syntax/rrst.vim
+++ b/uvim/runtime/syntax/rrst.mnv
@@ -1,11 +1,11 @@
 " reStructured Text with R statements
 " Language: reST with R code chunks
 " Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
-" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Homepage: https://github.com/jalvesaq/R-MNV-runtime
 " Last Change: Thu Apr 05, 2018  11:06PM
 "
 " CONFIGURATION:
-"   To highlight chunk headers as R code, put in your vimrc:
+"   To highlight chunk headers as R code, put in your mnvrc:
 "   let rrst_syn_hl_chunk = 1
 
 if exists("b:current_syntax")
@@ -13,11 +13,11 @@ if exists("b:current_syntax")
 endif
 
 " load all of the rst info
-runtime syntax/rst.vim
+runtime syntax/rst.mnv
 unlet! b:current_syntax
 
 " load all of the r syntax highlighting rules into @R
-syntax include @R syntax/r.vim
+syntax include @R syntax/r.mnv
 
 " highlight R chunks
 if exists("g:rrst_syn_hl_chunk")
@@ -40,4 +40,4 @@ hi def link rrstInlineDelim Special
 
 let b:current_syntax = "rrst"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/rst.vim b/uvim/runtime/syntax/rst.mnv
index 9584947df5..5de379822a 100644
--- a/uvim/runtime/syntax/rst.vim
+++ b/uvim/runtime/syntax/rst.mnv
@@ -1,9 +1,9 @@
-" Vim reST syntax file
+" MNV reST syntax file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
 " Reference: https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
-" Website: https://github.com/marshallward/vim-restructuredtext
+" Website: https://github.com/marshallward/mnv-restructuredtext
 " Latest Revision: 2025-10-13
 
 if exists("b:current_syntax")
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " reStructuredText is case-insensitive
 syntax case ignore
@@ -205,7 +205,7 @@ syn region rstCodeBlock contained matchgroup=rstDirective
 syn cluster rstDirectives add=rstCodeBlock
 
 if !exists('g:rst_syntax_code_list')
-    " A mapping from a Vim filetype to a list of alias patterns (pattern
+    " A mapping from a MNV filetype to a list of alias patterns (pattern
     " branches to be specific, see ':help /pattern'). E.g. given:
     "
     "   let g:rst_syntax_code_list = {
@@ -225,7 +225,7 @@ if !exists('g:rst_syntax_code_list')
     " will both be highlighted as C++ code. As shown by the latter block
     " pattern matching will be case-insensitive.
     let g:rst_syntax_code_list = {
-        \ 'vim': ['vim'],
+        \ 'mnv': ['mnv'],
         \ 'java': ['java'],
         \ 'cpp': ['cpp', 'c++'],
         \ 'lisp': ['lisp'],
@@ -252,7 +252,7 @@ for s:filetype in keys(g:rst_syntax_code_list)
                 \.join(g:rst_syntax_code_list[s:filetype], '\|')
                 \.'\)'
 
-    exe 'syn include @rst'.s:filetype.' syntax/'.s:filetype.'.vim'
+    exe 'syn include @rst'.s:filetype.' syntax/'.s:filetype.'.mnv'
     exe 'syn region rstDirective'.s:filetype
                 \.' matchgroup=rstDirective fold'
                 \.' start="\c\%(sourcecode\|code\%(-block\)\=\)::\s\+'.s:alias_pattern.'\_s*\n\ze\z(\s\+\)"'
diff --git a/uvim/runtime/syntax/rtf.vim b/uvim/runtime/syntax/rtf.mnv
index f8e031ba21..c1841a0da4 100644
--- a/uvim/runtime/syntax/rtf.vim
+++ b/uvim/runtime/syntax/rtf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Rich Text Format
 "		"*.rtf" files
 "
@@ -8,7 +8,7 @@
 " rtf documentation at http://night.primate.wisc.edu/software/RTF/
 "
 " Maintainer:	Dominique Stéphan (dominique@mggen.com)
-" URL: http://www.mggen.com/vim/syntax/rtf.zip
+" URL: http://www.mggen.com/mnv/syntax/rtf.zip
 " Last change:	2001 Mai 02
 
 " TODO: render underline, italic, bold
@@ -72,4 +72,4 @@ hi def link rtfBlue	rtfBlue
 
 let b:current_syntax = "rtf"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/ruby.vim b/uvim/runtime/syntax/ruby.mnv
index 88aff7ddb8..11b7cfa2d5 100644
--- a/uvim/runtime/syntax/ruby.vim
+++ b/uvim/runtime/syntax/ruby.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Ruby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" URL:			https://github.com/mnv-ruby/mnv-ruby
 " Last Change:		2023 Mar 16
 " ----------------------------------------------------------------------------
 "
 " Previous Maintainer:	Mirko Nasato
-" Thanks to perl.vim authors, and to Reimer Behrends. :-) (MN)
+" Thanks to perl.mnv authors, and to Reimer Behrends. :-) (MN)
 " ----------------------------------------------------------------------------
 
 " Prelude {{{1
@@ -16,7 +16,7 @@ endif
 
 " this file uses line continuations
 let s:cpo_sav = &cpo
-set cpo&vim
+set cpo&mnv
 
 " eRuby Config {{{1
 if exists('main_syntax') && main_syntax == 'eruby'
@@ -602,4 +602,4 @@ unlet! s:cpo_sav
 
 delc SynFold
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/rust.vim b/uvim/runtime/syntax/rust.mnv
index 55d3f14dc2..cb43176baa 100644
--- a/uvim/runtime/syntax/rust.vim
+++ b/uvim/runtime/syntax/rust.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Rust
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
 " Maintainer:   Ben Blum <bblum@cs.cmu.edu>
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
 " Last Change:  2023-09-11
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
+" For bugs, patches and license go to https://github.com/rust-lang/rust.mnv
 
 if version < 600
     syntax clear
@@ -221,7 +221,7 @@ syn region rustCommentBlockDocNestError matchgroup=rustCommentBlockDocError star
 " importantly, a case like ``/* */*`` should have the final ``*`` not being in
 " a comment, but in practice at present it leaves comments open two levels
 " deep. But as long as you stay away from that particular case, I *believe*
-" the highlighting is correct. Due to the way Vim's syntax engine works
+" the highlighting is correct. Due to the way MNV's syntax engine works
 " (greedy for start matches, unlike Rust's tokeniser which is searching for
 " the earliest-starting match, start or end), I believe this cannot be solved.
 " Oh you who would fix it, don't bother with things like duplicating the Block
@@ -259,11 +259,11 @@ syn region rustFoldBraces start="{" end="}" transparent fold
 
 if !exists("b:current_syntax_embed")
     let b:current_syntax_embed = 1
-    syntax include @RustCodeInComment <sfile>:p:h/rust.vim
+    syntax include @RustCodeInComment <sfile>:p:h/rust.mnv
     unlet b:current_syntax_embed
 
     " Currently regions marked as ```<some-other-syntax> will not get
-    " highlighted at all. In the future, we can do as vim-markdown does and
+    " highlighted at all. In the future, we can do as mnv-markdown does and
     " highlight with the other syntax. But for now, let's make sure we find
     " the closing block marker, because the rules below won't catch it.
     syn region rustCommentLinesDocNonRustCode matchgroup=rustCommentDocCodeFence start='^\z(\s*//[!/]\s*```\).\+$' end='^\z1$' keepend contains=rustCommentLineDoc
@@ -384,4 +384,4 @@ syn sync maxlines=500
 
 let b:current_syntax = "rust"
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/syntax/salt.vim b/uvim/runtime/syntax/salt.mnv
index fdbce2f677..3d7d9abd48 100644
--- a/uvim/runtime/syntax/salt.vim
+++ b/uvim/runtime/syntax/salt.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Maintainer: Gregory Anders
 " Last Changed: 2024-09-16
 
@@ -7,10 +7,10 @@ if exists('b:current_syntax')
 endif
 
 " Salt state files are just YAML with embedded Jinja
-runtime! syntax/yaml.vim
+runtime! syntax/yaml.mnv
 unlet! b:current_syntax
 
-runtime! syntax/jinja.vim
+runtime! syntax/jinja.mnv
 unlet! b:current_syntax
 
 let b:current_syntax = 'salt'
diff --git a/uvim/runtime/syntax/samba.vim b/uvim/runtime/syntax/samba.mnv
index e096436626..095061df67 100644
--- a/uvim/runtime/syntax/samba.vim
+++ b/uvim/runtime/syntax/samba.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	samba configuration files (smb.conf)
 " Maintainer:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
-" URL:		http://rgarciasuarez.free.fr/vim/syntax/samba.vim
+" URL:		http://rgarciasuarez.free.fr/mnv/syntax/samba.mnv
 " Last change:	2009 Aug 06
 "
 "               New maintainer wanted!
@@ -115,4 +115,4 @@ hi def link sambaBoolean   Constant
 
 let b:current_syntax = "samba"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sas.vim b/uvim/runtime/syntax/sas.mnv
index fad6066737..1e5581a251 100644
--- a/uvim/runtime/syntax/sas.vim
+++ b/uvim/runtime/syntax/sas.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     SAS
 " Maintainer:   Zhen-Huan Hu <wildkeny@gmail.com>
 " Original Maintainer: James Kidd <james.kidd@covance.com>
@@ -49,7 +49,7 @@
 " - Add complete DS2 syntaxes
 " - Add basic IML syntaxes
 " - Many other improvements and bug fixes
-" Drop support for VIM version < 600
+" Drop support for MNV version < 600
 
 if version < 600
   syntax clear
@@ -58,7 +58,7 @@ elseif exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
diff --git a/uvim/runtime/syntax/sass.vim b/uvim/runtime/syntax/sass.mnv
index 8f41aba4f7..4b6fdbe793 100644
--- a/uvim/runtime/syntax/sass.vim
+++ b/uvim/runtime/syntax/sass.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Sass
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	*.sass
 " Last Change:	2022 Mar 15
 
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/css.vim
+runtime! syntax/css.mnv
 
 syn case ignore
 
@@ -103,4 +103,4 @@ hi def link sassClass                   Type
 
 let b:current_syntax = "sass"
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/sather.vim b/uvim/runtime/syntax/sather.mnv
index de8bdade67..d17a25d685 100644
--- a/uvim/runtime/syntax/sather.vim
+++ b/uvim/runtime/syntax/sather.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Sather/pSather
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/sather.vim
+" URL:		http://www.fleiner.com/mnv/syntax/sather.mnv
 " Last Change:	2003 May 11
 
 " Sather is a OO-language developped at the International Computer Science
@@ -89,4 +89,4 @@ hi def link satherExternal		PreCondit
 
 let b:current_syntax = "sather"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sbt.vim b/uvim/runtime/syntax/sbt.mnv
index cbf73beafe..c91ab65ae5 100644
--- a/uvim/runtime/syntax/sbt.vim
+++ b/uvim/runtime/syntax/sbt.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    sbt
 " Maintainer:  Steven Dobay <stevendobay at protonmail.com>
 " Last Change: 2017.04.30
@@ -7,7 +7,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/scala.vim
+runtime! syntax/scala.mnv
 
 syn region sbtString start="\"[^"]" skip="\\\"" end="\"" contains=sbtStringEscape
 syn match sbtStringEscape "\\u[0-9a-fA-F]\{4}" contained
diff --git a/uvim/runtime/syntax/scala.vim b/uvim/runtime/syntax/scala.mnv
index cc098ce017..fdfc710b0b 100644
--- a/uvim/runtime/syntax/scala.vim
+++ b/uvim/runtime/syntax/scala.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Scala
 " Maintainer:           Derek Wyatt
-" URL:                  https://github.com/derekwyatt/vim-scala
-" License:              Same as Vim
+" URL:                  https://github.com/derekwyatt/mnv-scala
+" License:              Same as MNV
 " Last Change:          23 January 2022
 " ----------------------------------------------------------------------------
 
@@ -230,4 +230,4 @@ if main_syntax ==# 'scala'
   unlet main_syntax
 endif
 
-" vim:set sw=2 sts=2 ts=8 et:
+" mnv:set sw=2 sts=2 ts=8 et:
diff --git a/uvim/runtime/syntax/scdoc.vim b/uvim/runtime/syntax/scdoc.mnv
index 0180f35027..9ebc186f35 100644
--- a/uvim/runtime/syntax/scdoc.vim
+++ b/uvim/runtime/syntax/scdoc.mnv
@@ -1,7 +1,7 @@
 " Syntax file for scdoc files
 " Maintainer: Gregory Anders <contact@gpanders.com>
 " Last Updated: 2022-05-09
-" Upstream: https://github.com/gpanders/vim-scdoc
+" Upstream: https://github.com/gpanders/mnv-scdoc
 
 if exists('b:current_syntax')
     finish
diff --git a/uvim/runtime/syntax/scheme.vim b/uvim/runtime/syntax/scheme.mnv
index 59b0cc5b18..3db07dbe63 100644
--- a/uvim/runtime/syntax/scheme.vim
+++ b/uvim/runtime/syntax/scheme.mnv
@@ -1,19 +1,19 @@
-" Vim syntax file
+" MNV syntax file
 " Language:            Scheme (R7RS)
 " Last Change:         2024 Jun 21
 " Author:              Evan Hanson <evhan@foldling.org>
 " Maintainer:          Evan Hanson <evhan@foldling.org>
 " Previous Author:     Dirk van Deun <dirk@igwe.vub.ac.be>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
-" Repository:          https://git.foldling.org/vim-scheme.git
-" URL:                 https://foldling.org/vim/syntax/scheme.vim
+" Repository:          https://git.foldling.org/mnv-scheme.git
+" URL:                 https://foldling.org/mnv/syntax/scheme.mnv
 
 if exists('b:current_syntax')
   finish
 endif
 
 let s:cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn spell notoplevel
 
@@ -461,7 +461,7 @@ hi def link schemeTypeSyntax Type
 let b:did_scheme_syntax = 1
 
 if exists('b:is_chicken') || exists('g:is_chicken')
-  exe 'ru! syntax/chicken.vim'
+  exe 'ru! syntax/chicken.mnv'
 endif
 
 unlet b:did_scheme_syntax
diff --git a/uvim/runtime/syntax/scilab.vim b/uvim/runtime/syntax/scilab.mnv
index 03e123b058..48f3b25c3e 100644
--- a/uvim/runtime/syntax/scilab.vim
+++ b/uvim/runtime/syntax/scilab.mnv
@@ -1,10 +1,10 @@
 "
-" Vim syntax file
+" MNV syntax file
 " Language   :	Scilab
 " Maintainer :	Benoit Hamelin
 " File type  :	*.sci (see :help filetype)
 " History
-"	28jan2002	benoith		0.1		Creation.  Adapted from matlab.vim.
+"	28jan2002	benoith		0.1		Creation.  Adapted from matlab.mnv.
 "	04feb2002	benoith		0.5		Fixed bugs with constant highlighting.
 "
 
@@ -99,4 +99,4 @@ hi def link scilabOverload				Special
 
 let b:current_syntax = "scilab"
 
-"EOF	vim: ts=4 noet tw=100 sw=4 sts=0
+"EOF	mnv: ts=4 noet tw=100 sw=4 sts=0
diff --git a/uvim/runtime/syntax/screen.vim b/uvim/runtime/syntax/screen.mnv
index d576d29b7a..38a85a5ce0 100644
--- a/uvim/runtime/syntax/screen.vim
+++ b/uvim/runtime/syntax/screen.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             screen(1) configuration file
 " Maintainer:           Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   screenEscape    '\\.'
 
diff --git a/uvim/runtime/syntax/scss.vim b/uvim/runtime/syntax/scss.mnv
index 9d79dc5cb6..99a471e456 100644
--- a/uvim/runtime/syntax/scss.vim
+++ b/uvim/runtime/syntax/scss.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SCSS
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Maintainer:	Tim Pope <mnvNOSPAM@tpope.org>
 " Filenames:	*.scss
 " Last Change:	2019 Dec 05
 
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/sass.vim
+runtime! syntax/sass.mnv
 
 syn clear sassComment
 syn clear sassCssComment
@@ -22,4 +22,4 @@ hi def link scssComment Comment
 
 let b:current_syntax = "scss"
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/sd.vim b/uvim/runtime/syntax/sd.mnv
index b497ba5eaa..7d153f61d0 100644
--- a/uvim/runtime/syntax/sd.vim
+++ b/uvim/runtime/syntax/sd.mnv
@@ -1,8 +1,8 @@
 " Language: streaming descriptor file
 " Maintainer: Puria Nafisi Azizi (pna) <pna@netstudent.polito.it>
 " License: This file can be redistribued and/or modified under the same terms
-"   as Vim itself.
-" URL: http://netstudent.polito.it/vim_syntax/
+"   as MNV itself.
+" URL: http://netstudent.polito.it/mnv_syntax/
 " Last Change: 2012 Feb 03 by Thilo Six
 
 " quit when a syntax file was already loaded
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Always ignore case
 syn case ignore
diff --git a/uvim/runtime/syntax/sdc.vim b/uvim/runtime/syntax/sdc.mnv
index ae2aae5f07..8775067705 100644
--- a/uvim/runtime/syntax/sdc.vim
+++ b/uvim/runtime/syntax/sdc.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     SDC - Synopsys Design Constraints
 " Maintainer:   Maurizio Tranchero - maurizio.tranchero@gmail.com
-" Credits:      based on TCL Vim syntax file
+" Credits:      based on TCL MNV syntax file
 " Version:	0.3
 " Last Change:  Thu Mar  25 17:35:16 CET 2009
-" 2024 Jul 17 by Vim Project (update to SDC 2.1)
+" 2024 Jul 17 by MNV Project (update to SDC 2.1)
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the TCL syntax to start with
-runtime! syntax/tcl.vim
+runtime! syntax/tcl.mnv
 
 " TCL extension related to SDC and available from some vendors
 " (not defined in SDC standard!)
@@ -74,4 +74,4 @@ hi def link sdcFlags		Special
 
 let b:current_syntax = "sdc"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sdl.vim b/uvim/runtime/syntax/sdl.mnv
index 7df38d1955..353bb8a30e 100644
--- a/uvim/runtime/syntax/sdl.vim
+++ b/uvim/runtime/syntax/sdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SDL
 " Maintainer:	Michael Piefel <entwurf@piefel.de>
 " Last Change:	2 May 2001
@@ -150,4 +150,4 @@ delcommand Hi
 
 let b:current_syntax = "sdl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sed.vim b/uvim/runtime/syntax/sed.mnv
index da6c9f85f6..aea5381d6c 100644
--- a/uvim/runtime/syntax/sed.vim
+++ b/uvim/runtime/syntax/sed.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		sed
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
@@ -170,4 +170,4 @@ unlet s:highlight_tabs
 
 let b:current_syntax = "sed"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/sendpr.vim b/uvim/runtime/syntax/sendpr.mnv
index 2541b95c67..2da96fb9ec 100644
--- a/uvim/runtime/syntax/sendpr.vim
+++ b/uvim/runtime/syntax/sendpr.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language: FreeBSD send-pr file
 " Maintainer: Hendrik Scholz <hendrik@scholz.net>
 " Last Change: 2022 Jun 14
 "
-" http://raisdorf.net/files/misc/send-pr.vim
+" http://raisdorf.net/files/misc/send-pr.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match sendprComment /^SEND-PR:/
 " email address
diff --git a/uvim/runtime/syntax/sensors.vim b/uvim/runtime/syntax/sensors.mnv
index f8bc4c696b..25839a8580 100644
--- a/uvim/runtime/syntax/sensors.vim
+++ b/uvim/runtime/syntax/sensors.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             sensors.conf(5) - libsensors configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword sensorsTodo         contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/services.vim b/uvim/runtime/syntax/services.mnv
index 94e39ae219..a92ac45ee5 100644
--- a/uvim/runtime/syntax/services.vim
+++ b/uvim/runtime/syntax/services.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             services(5) - Internet network services list
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   servicesBegin     display '^'
                               \ nextgroup=servicesName,servicesComment
diff --git a/uvim/runtime/syntax/setserial.vim b/uvim/runtime/syntax/setserial.mnv
index 967fa5f6d2..590df85c93 100644
--- a/uvim/runtime/syntax/setserial.vim
+++ b/uvim/runtime/syntax/setserial.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             setserial(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   setserialBegin      display '^'
                                 \ nextgroup=setserialDevice,setserialComment
diff --git a/uvim/runtime/syntax/sexplib.vim b/uvim/runtime/syntax/sexplib.mnv
index 55dd3fb494..9903d3741a 100644
--- a/uvim/runtime/syntax/sexplib.vim
+++ b/uvim/runtime/syntax/sexplib.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     S-expressions as used in Sexplib
 " Filenames:    *.sexp
 " Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
-" URL:          https://github.com/ocaml/vim-ocaml
-" Last Change:  2020 Dec 31 - Updated header for Vim contribution (MM)
+" URL:          https://github.com/ocaml/mnv-ocaml
+" Last Change:  2020 Dec 31 - Updated header for MNV contribution (MM)
 "               2017 Apr 11 - Improved matching of negative numbers (MM)
 "               2012 Jun 20 - Fixed a block comment highlighting bug (MM)
 
@@ -85,4 +85,4 @@ endif
 
 let b:current_syntax = "sexplib"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sgml.vim b/uvim/runtime/syntax/sgml.mnv
index ed8fa8cf12..656b07b9fd 100644
--- a/uvim/runtime/syntax/sgml.vim
+++ b/uvim/runtime/syntax/sgml.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SGML
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Tue, 27 Apr 2004 15:05:21 CEST
 " Filenames:	*.sgml,*.sgm
-" $Id: sgml.vim,v 1.1 2004/06/13 17:52:57 vimboss Exp $
+" $Id: sgml.mnv,v 1.1 2004/06/13 17:52:57 mnvboss Exp $
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:sgml_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -270,11 +270,11 @@ syn match    sgmlCdataEnd   +]]>+          contained
 syn region  sgmlProcessing matchgroup=sgmlProcessingDelim start="<?" end="?>" contains=sgmlAttrib,sgmlEqualValue
 
 
-" DTD -- we use dtd.vim here
+" DTD -- we use dtd.mnv here
 syn region  sgmlDocType matchgroup=sgmlDocTypeDecl start="\c<!DOCTYPE"he=s+2,rs=s+2 end=">" contains=sgmlDocTypeKeyword,sgmlInlineDTD,sgmlString
 syn keyword sgmlDocTypeKeyword contained DOCTYPE PUBLIC SYSTEM
 syn region  sgmlInlineDTD contained start="\[" end="]" contains=@sgmlDTD
-syn include @sgmlDTD <sfile>:p:h/dtd.vim
+syn include @sgmlDTD <sfile>:p:h/dtd.mnv
 
 
 " synchronizing
@@ -331,4 +331,4 @@ let b:current_syntax = "sgml"
 let &cpo = s:sgml_cpo_save
 unlet s:sgml_cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sgmldecl.vim b/uvim/runtime/syntax/sgmldecl.mnv
index 6c1cde15ae..1f41ac6ca5 100644
--- a/uvim/runtime/syntax/sgmldecl.vim
+++ b/uvim/runtime/syntax/sgmldecl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SGML (SGML Declaration <!SGML ...>)
 " Last Change: jueves, 28 de diciembre de 2000, 13:51:44 CLST
 " Maintainer: "Daniel A. Molina W." <sickd@linux-chile.org>
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -69,4 +69,4 @@ let b:current_syntax = "sgmldecl"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:set tw=78 ts=4:
+" mnv:set tw=78 ts=4:
diff --git a/uvim/runtime/syntax/sgmllnx.vim b/uvim/runtime/syntax/sgmllnx.mnv
index ccd78f494a..104b9f0703 100644
--- a/uvim/runtime/syntax/sgmllnx.vim
+++ b/uvim/runtime/syntax/sgmllnx.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SGML-linuxdoc (supported by old sgmltools-1.x)
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
 " Last Change:	2013 May 13
@@ -51,4 +51,4 @@ hi def link sgmllnxTagError    Error
 
 let b:current_syntax = "sgmllnx"
 
-" vim:set tw=78 ts=8 sts=2 sw=2 noet:
+" mnv:set tw=78 ts=8 sts=2 sw=2 noet:
diff --git a/uvim/runtime/syntax/sh.vim b/uvim/runtime/syntax/sh.mnv
index f9aaa932a4..0dcc0cdd81 100644
--- a/uvim/runtime/syntax/sh.vim
+++ b/uvim/runtime/syntax/sh.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		This runtime file is looking for a new maintainer.
 " Previous Maintainers:	Charles E. Campbell
 " 		Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		2024 Mar 04 by Vim Project {{{1
+" Last Change:		2024 Mar 04 by MNV Project {{{1
 "		2024 Nov 03 by Aliaksei Budavei <0x000c70 AT gmail DOT com> improved bracket expressions, #15941
 "		2025 Jan 06 add $PS0 to bashSpecialVariables #16394
 "		2025 Jan 18 add bash coproc, remove duplicate syn keywords #16467
@@ -25,7 +25,7 @@
 "		2026 Mar 23 improve matching of function definitions #19638
 " }}}
 " Version:		208
-" Former URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
+" Former URL:		http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
 
@@ -156,7 +156,7 @@ endif
 if !exists("g:sh_fold_enabled")
     let g:sh_fold_enabled= 0
 elseif g:sh_fold_enabled != 0 && !has("folding")
-    echomsg "Ignoring g:sh_fold_enabled=".g:sh_fold_enabled."; need to re-compile vim for +fold support"
+    echomsg "Ignoring g:sh_fold_enabled=".g:sh_fold_enabled."; need to re-compile mnv for +fold support"
     let g:sh_fold_enabled= 0
 endif
 let s:sh_fold_functions= and(g:sh_fold_enabled,1)
@@ -470,7 +470,7 @@ syn match   shEscape	contained	'\%(^\)\@!\%(\\\\\)*\\.'
 " some systems (HP?) have as their /bin/sh a (link to) Korn shell
 " (ie. Posix compliant shell).  /bin/ksh should work for those
 " systems too, however, so the following syntax will flag $(..) as
-" an Error under /bin/sh.  By consensus of vimdev'ers!
+" an Error under /bin/sh.  By consensus of mnvdev'ers!
 if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
     syn region shCommandSub matchgroup=shCmdSubRegion start="\$((\@!"  skip='\\\\\|\\.' end=")"  contains=@shCommandSubList
     if exists("b:is_kornshell")
@@ -1046,4 +1046,4 @@ else
     let b:current_syntax = "sh"
 endif
 
-" vim: ts=16 fdm=marker
+" mnv: ts=16 fdm=marker
diff --git a/uvim/runtime/syntax/shaderslang.vim b/uvim/runtime/syntax/shaderslang.mnv
index 1cae202b04..7c8f1b8b43 100644
--- a/uvim/runtime/syntax/shaderslang.vim
+++ b/uvim/runtime/syntax/shaderslang.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Slang
 " Maintainer:	Austin Shijo <epestr@proton.me>
 " Last Change:	2024 Jan 05
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 
 " Annotations
diff --git a/uvim/runtime/syntax/shared/README.txt b/uvim/runtime/syntax/shared/README.txt
index fade4b38a1..b9059c03e5 100644
--- a/uvim/runtime/syntax/shared/README.txt
+++ b/uvim/runtime/syntax/shared/README.txt
@@ -1,2 +1,2 @@
-This directory "runtime/syntax/shared" contains Vim script files that are
+This directory "runtime/syntax/shared" contains MNV script files that are
 generated or used by more than one syntax file.
diff --git a/uvim/runtime/syntax/shared/debarchitectures.vim b/uvim/runtime/syntax/shared/debarchitectures.mnv
index 8005fe86f2..066a29e5d1 100644
--- a/uvim/runtime/syntax/shared/debarchitectures.vim
+++ b/uvim/runtime/syntax/shared/debarchitectures.mnv
@@ -1,7 +1,7 @@
 " Language:     Debian architecture information
-" Maintainer:   Debian Vim Maintainers
+" Maintainer:   Debian MNV Maintainers
 " Last Change:  2025 Jul 05
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/shared/debarchitectures.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/shared/debarchitectures.mnv
 
 let s:cpo = &cpo
 set cpo-=C
diff --git a/uvim/runtime/syntax/shared/debversions.vim b/uvim/runtime/syntax/shared/debversions.mnv
index 2548ddd350..f6e54845db 100644
--- a/uvim/runtime/syntax/shared/debversions.vim
+++ b/uvim/runtime/syntax/shared/debversions.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Debian version information
-" Maintainer:   Debian Vim Maintainers
+" Maintainer:   Debian MNV Maintainers
 " Last Change:  2026 Jan 01
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/shared/debversions.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/shared/debversions.mnv
 
 let s:cpo = &cpo
 set cpo-=C
diff --git a/uvim/runtime/syntax/shared/hgcommitDiff.vim b/uvim/runtime/syntax/shared/hgcommitDiff.mnv
index 0ab9c3d8c9..23e2fab1cf 100644
--- a/uvim/runtime/syntax/shared/hgcommitDiff.vim
+++ b/uvim/runtime/syntax/shared/hgcommitDiff.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Sapling / Mecurial Diff (context or unified)
 " Maintainer:	Max Coplan <mchcopl@gmail.com>
 "               Translations by Jakson Alves de Aquino.
 " Last Change:	2022-12-08
-" 2025-08-16 by Vim project, update zh_CN translations, #18011
-" Copied from:	runtime/syntax/diff.vim
+" 2025-08-16 by MNV project, update zh_CN translations, #18011
+" Copied from:	runtime/syntax/diff.mnv
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -388,4 +388,4 @@ hi def link hgDiffComment	Comment
 
 let b:current_syntax = "hgcommitDiff"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/shared/typescriptcommon.vim b/uvim/runtime/syntax/shared/typescriptcommon.mnv
index 9a909c6755..3956b0ffe1 100644
--- a/uvim/runtime/syntax/shared/typescriptcommon.vim
+++ b/uvim/runtime/syntax/shared/typescriptcommon.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TypeScript and TypeScriptReact
 " Maintainer:   Herrington Darkholme
 " Last Change:  2024 May 24
 " 2025 Aug 05   support for new TypeScript syntaxes
-" Based On:     Herrington Darkholme's yats.vim
-" Changes:      See https://github.com/HerringtonDarkholme/yats.vim
-" Credits:      See yats.vim on github
+" Based On:     Herrington Darkholme's yats.mnv
+" Changes:      See https://github.com/HerringtonDarkholme/yats.mnv
+" Credits:      See yats.mnv on github
 
 if &cpo =~ 'C'
   let s:cpo_save = &cpo
-  set cpo&vim
+  set cpo&mnv
 endif
 
 " NOTE: this results in accurate highlighting, but can be slow.
@@ -129,8 +129,8 @@ syntax region  typescriptString
 
 syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{1,6}})|c\u|.)"
 
-" From pangloss/vim-javascript
-" <https://github.com/pangloss/vim-javascript/blob/d6e137563c47fb59f26ed25d044c0c7532304f18/syntax/javascript.vim#L64-L72>
+" From pangloss/mnv-javascript
+" <https://github.com/pangloss/mnv-javascript/blob/d6e137563c47fb59f26ed25d044c0c7532304f18/syntax/javascript.mnv#L64-L72>
 syntax region  typescriptRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=typescriptSpecial extend
 syntax match   typescriptRegexpBoundary     contained "\v\c[$^]|\\b"
 syntax match   typescriptRegexpBackRef      contained "\v\\[1-9]\d*"
@@ -236,7 +236,7 @@ syntax match typescriptBinaryOp contained /\*\*=\?/ nextgroup=@typescriptValue
 
 syntax cluster typescriptSymbols               contains=typescriptBinaryOp,typescriptKeywordOp,typescriptTernary,typescriptAssign,typescriptCastKeyword
 
-" runtime syntax/ts-common/reserved.vim
+" runtime syntax/ts-common/reserved.mnv
 "Import
 syntax keyword typescriptImport                from as
 syntax keyword typescriptImport                import
diff --git a/uvim/runtime/syntax/sicad.vim b/uvim/runtime/syntax/sicad.mnv
index 20eb14cba1..80f946f1e2 100644
--- a/uvim/runtime/syntax/sicad.vim
+++ b/uvim/runtime/syntax/sicad.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     SiCAD (procedure language)
 " Maintainer:   Zsolt Branyiczky <zbranyiczky@lmark.mgx.hu>
 " Last Change:  2003 May 11
-" URL:		http://lmark.mgx.hu:81/download/vim/sicad.vim
+" URL:		http://lmark.mgx.hu:81/download/mnv/sicad.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " use SQL highlighting after 'sql' command
-syn include @SQL syntax/sql.vim
+syn include @SQL syntax/sql.mnv
 unlet b:current_syntax
 
 " spaces are used in (auto)indents since sicad hates tabulator characters
@@ -140,7 +140,7 @@ syn region sicadDopBlock transparent matchgroup=sicadStatement start='\<dop\>' s
 syn region sicadSqlBlock transparent matchgroup=sicadStatement start='\<sql\>' skip='\\ *$' end=';'me=e-1 end='$' contains=@SQL,sicadIdentifier,sicadLineCont
 
 " synchronizing
-syn sync clear  " clear sync used in sql.vim
+syn sync clear  " clear sync used in sql.mnv
 syn sync match sicadSyncComment groupthere NONE "\<docend\>"
 syn sync match sicadSyncComment grouphere sicadComment "\<docbeg\>"
 " next line must be examined too
@@ -382,9 +382,9 @@ hi def link sicadParenError sicadError
 hi def link sicadApostropheError sicadError
 hi def link sicadStringError sicadError
 hi def link sicadCommentError sicadError
-"  hi def link sqlStatement Special  " modified highlight group in sql.vim
+"  hi def link sqlStatement Special  " modified highlight group in sql.mnv
 
 
 let b:current_syntax = "sicad"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/sieve.vim b/uvim/runtime/syntax/sieve.mnv
index 35b4dfb79c..e371c37e38 100644
--- a/uvim/runtime/syntax/sieve.vim
+++ b/uvim/runtime/syntax/sieve.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Sieve filtering language input file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2007-10-25
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword sieveTodo         contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/sil.vim b/uvim/runtime/syntax/sil.mnv
index 43158da4a8..1574ef5243 100644
--- a/uvim/runtime/syntax/sil.vim
+++ b/uvim/runtime/syntax/sil.mnv
@@ -6,17 +6,17 @@
 " See https://swift.org/LICENSE.txt for license information
 " See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 "
-" Vim syntax file
+" MNV syntax file
 " Language: sil
 "
-" Vim maintainer: Emir SARI <bitigchi@me.com>
+" MNV maintainer: Emir SARI <bitigchi@me.com>
 
 if exists("b:current_syntax")
     finish
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword silStage skipwhite nextgroup=silStages
       \ sil_stage
diff --git a/uvim/runtime/syntax/simula.vim b/uvim/runtime/syntax/simula.mnv
index 82f66d049e..75ade8de55 100644
--- a/uvim/runtime/syntax/simula.vim
+++ b/uvim/runtime/syntax/simula.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Simula
 " Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
-" URL:		http://folk.uio.no/hakonrk/vim/syntax/simula.vim
+" URL:		http://folk.uio.no/hakonrk/mnv/syntax/simula.mnv
 " Last Change:	2001 May 15
 
 " quit when a syntax file was already loaded
@@ -84,4 +84,4 @@ hi def link simulaType			Type
 
 
 let b:current_syntax = "simula"
-" vim: sts=4 sw=4 ts=8
+" mnv: sts=4 sw=4 ts=8
diff --git a/uvim/runtime/syntax/sinda.vim b/uvim/runtime/syntax/sinda.mnv
index a6e5b45fcd..a97f363552 100644
--- a/uvim/runtime/syntax/sinda.vim
+++ b/uvim/runtime/syntax/sinda.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     sinda85, sinda/fluint input file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.sin
-" URL:		http://www.naglenet.org/vim/syntax/sinda.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/sinda.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -29,7 +29,7 @@ syn case ignore
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-runtime! syntax/fortran.vim
+runtime! syntax/fortran.mnv
 unlet b:current_syntax
 
 
@@ -126,4 +126,4 @@ hi def link sindaTodo		Todo
 
 let b:current_syntax = "sinda"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/sindacmp.vim b/uvim/runtime/syntax/sindacmp.mnv
index 88373eb285..d7c3122254 100644
--- a/uvim/runtime/syntax/sindacmp.vim
+++ b/uvim/runtime/syntax/sindacmp.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     sinda85, sinda/fluint compare file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.cmp
-" URL:		http://www.naglenet.org/vim/syntax/sindacmp.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/sindacmp.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -58,4 +58,4 @@ hi def link sindacmpFloat		     Special
 
 let b:current_syntax = "sindacmp"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/sindaout.vim b/uvim/runtime/syntax/sindaout.mnv
index c362f19467..bc5c16cb44 100644
--- a/uvim/runtime/syntax/sindaout.vim
+++ b/uvim/runtime/syntax/sindaout.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     sinda85, sinda/fluint output file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.out
-" URL:		http://www.naglenet.org/vim/syntax/sindaout.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/sindaout.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -21,7 +21,7 @@ syn case match
 
 
 " Load SINDA syntax file
-runtime! syntax/sinda.vim
+runtime! syntax/sinda.mnv
 unlet b:current_syntax
 
 
@@ -80,4 +80,4 @@ hi def link sindaoutError		     Error
 
 let b:current_syntax = "sindaout"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/sisu.vim b/uvim/runtime/syntax/sisu.mnv
index 264aae0600..58553bdf12 100644
--- a/uvim/runtime/syntax/sisu.vim
+++ b/uvim/runtime/syntax/sisu.mnv
@@ -1,17 +1,17 @@
-" SiSU Vim syntax file
+" SiSU MNV syntax file
 " SiSU Maintainer: Ralph Amissah <ralph.amissah@gmail.com>
 " SiSU Markup:     SiSU (sisu-5.6.7)
 " Last Change:     2017 Jun 22
-" URL: <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
-"      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
-"(originally looked at Ruby Vim by Mirko Nasato)
+" URL: <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/mnv/syntax/sisu.mnv;hb=HEAD>
+"      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/mnv/syntax/sisu.mnv;hb=HEAD>
+"(originally looked at Ruby MNV by Mirko Nasato)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 "% "Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
diff --git a/uvim/runtime/syntax/skhd.vim b/uvim/runtime/syntax/skhd.mnv
index 6bda7a60ac..f4233080a3 100644
--- a/uvim/runtime/syntax/skhd.vim
+++ b/uvim/runtime/syntax/skhd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	skhd configuration file
 " Maintainer:	Kiyoon Kim <https://github.com/kiyoon>
 " Last Change:	2025 Jan 22
@@ -42,8 +42,8 @@ syn match skhdSubCmd   /\<window\>\|\<space\>\|\<display\>/
 " ───────────────────────────────────────────────────────────────────
 "  Treat anything after a single “:” (not double‑colon) as bash
 " ───────────────────────────────────────────────────────────────────
-" load Vim’s built‑in shell rules
-syntax include @bash syntax/bash.vim
+" load MNV’s built‑in shell rules
+syntax include @bash syntax/bash.mnv
 
 " After `:` (not `::`) is a bash command, but not when it is preceded by a `\`
 syn region skhdBash
@@ -110,7 +110,7 @@ syn region skhdBlacklistBlock
 syn region skhdString start=/"/ skip=/\\"/ end=/"/
 
 " ────────────────────────────────────────────────────────────────
-"  Linking to standard Vim highlight groups
+"  Linking to standard MNV highlight groups
 " ────────────────────────────────────────────────────────────────
 hi def link skhdComment    Comment
 hi def link skhdHeadline   Title
diff --git a/uvim/runtime/syntax/skill.vim b/uvim/runtime/syntax/skill.mnv
index dd4c191b6f..70eea9d7ea 100644
--- a/uvim/runtime/syntax/skill.vim
+++ b/uvim/runtime/syntax/skill.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		SKILL
 " Maintainer:	Toby Schaffer <jtschaff@eos.ncsu.edu>
 " Comments:		SKILL is a Lisp-like programming language for use in EDA
@@ -8,7 +8,7 @@
 "				database. This file also defines syntax highlighting for
 "				certain Design Framework II interface functions.
 " Last Change:	2003 May 11
-" 2024 Oct 08 by Vim Project: allow double backslashes in skillString
+" 2024 Oct 08 by MNV Project: allow double backslashes in skillString
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -547,4 +547,4 @@ hi def link skillCommentError	Error
 
 let b:current_syntax = "skill"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/sl.vim b/uvim/runtime/syntax/sl.mnv
index 1f6c847353..dd2a061637 100644
--- a/uvim/runtime/syntax/sl.vim
+++ b/uvim/runtime/syntax/sl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Renderman shader language
 " Maintainer:	Dan Piponi <dan@tanelorn.demon.co.uk>
 " Last Change:	2001 May 09
@@ -104,4 +104,4 @@ hi def link slVariable	Identifier
 
 let b:current_syntax = "sl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/slang.vim b/uvim/runtime/syntax/slang.mnv
index 53ede4dc5a..ecd73a8b01 100644
--- a/uvim/runtime/syntax/slang.vim
+++ b/uvim/runtime/syntax/slang.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	S-Lang
 " Maintainer:	Jan Hlavacek <lahvak@math.ohio-state.edu>
 " Last Change:	980216
@@ -86,4 +86,4 @@ hi def link slangDelim		Delimiter
 
 let b:current_syntax = "slang"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/slice.vim b/uvim/runtime/syntax/slice.mnv
index 3a57ece913..415d6f086d 100644
--- a/uvim/runtime/syntax/slice.vim
+++ b/uvim/runtime/syntax/slice.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Slice (ZeroC's Specification Language for Ice)
 " Maintainer:	Morel Bodin <slice06@nym.hush.com>
 " Last Change:	2005 Dec 03
@@ -27,7 +27,7 @@ syn region  sliceGuard      start="^#\(define\|ifndef\|endif\)" end="$"
 " Strings and characters
 syn region sliceString		start=+"+  end=+"+
 
-" Numbers (shamelessly ripped from c.vim, only slightly modified)
+" Numbers (shamelessly ripped from c.mnv, only slightly modified)
 "integer number, or floating point number without a dot and with "f".
 syn case ignore
 syn match   sliceNumbers    display transparent "\<\d\|\.\d" contains=sliceNumber,sliceFloat,sliceOctal
@@ -75,4 +75,4 @@ hi def link sliceNumberError Special
 
 let b:current_syntax = "slice"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/slpconf.vim b/uvim/runtime/syntax/slpconf.mnv
index 712ba90719..febe53a3ac 100644
--- a/uvim/runtime/syntax/slpconf.vim
+++ b/uvim/runtime/syntax/slpconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             RFC 2614 - An API for Service Location configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword slpconfTodo         contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/slpreg.vim b/uvim/runtime/syntax/slpreg.mnv
index a177b063f0..19492bfe5f 100644
--- a/uvim/runtime/syntax/slpreg.vim
+++ b/uvim/runtime/syntax/slpreg.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             RFC 2614 - An API for Service Location registration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword slpregTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/slpspi.vim b/uvim/runtime/syntax/slpspi.mnv
index eaeb02a80f..245481331b 100644
--- a/uvim/runtime/syntax/slpspi.vim
+++ b/uvim/runtime/syntax/slpspi.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             RFC 2614 - An API for Service Location SPI file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword slpspiTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/slrnrc.vim b/uvim/runtime/syntax/slrnrc.mnv
index 004bdd1bb1..bef4ba542e 100644
--- a/uvim/runtime/syntax/slrnrc.vim
+++ b/uvim/runtime/syntax/slrnrc.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Slrn setup file (based on slrn 0.9.8.1)
-" Maintainer:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+" Maintainer:	Preben 'Peppe' Guldberg <peppe-mnv@wielders.org>
 " Last Change:	23 April 2006
 
 " quit when a syntax file was already loaded
@@ -178,4 +178,4 @@ hi def link slrnrcUnsetkey		slrnrcSetkey
 
 let b:current_syntax = "slrnrc"
 
-"EOF	vim: ts=8 noet tw=120 sw=8 sts=0
+"EOF	mnv: ts=8 noet tw=120 sw=8 sts=0
diff --git a/uvim/runtime/syntax/slrnsc.vim b/uvim/runtime/syntax/slrnsc.mnv
index 9f51cad380..17a498a114 100644
--- a/uvim/runtime/syntax/slrnsc.vim
+++ b/uvim/runtime/syntax/slrnsc.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Slrn score file (based on slrn 0.9.8.0)
 " Maintainer:	Preben 'Peppe' Guldberg <peppe@wielders.org>
 " Last Change:	8 Oct 2004
@@ -65,4 +65,4 @@ hi def link slrnscInclude		Keyword
 
 let b:current_syntax = "slrnsc"
 
-"EOF	vim: ts=8 noet tw=200 sw=8 sts=0
+"EOF	mnv: ts=8 noet tw=200 sw=8 sts=0
diff --git a/uvim/runtime/syntax/sm.vim b/uvim/runtime/syntax/sm.mnv
index 13a5bf117e..5e20302016 100644
--- a/uvim/runtime/syntax/sm.vim
+++ b/uvim/runtime/syntax/sm.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	sendmail
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Oct 25, 2016
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:	9
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SM
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_SM
 if exists("b:current_syntax")
   finish
 endif
@@ -79,4 +79,4 @@ hi def link smVar		String
 
 let b:current_syntax = "sm"
 
-" vim: ts=18
+" mnv: ts=18
diff --git a/uvim/runtime/syntax/smarty.vim b/uvim/runtime/syntax/smarty.mnv
index a39c290abe..3b027cf957 100644
--- a/uvim/runtime/syntax/smarty.vim
+++ b/uvim/runtime/syntax/smarty.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Smarty Templates
 " Maintainer:	Manfred Stienstra manfred.stienstra@dwerg.net
 " Last Change:  Mon Nov  4 11:42:23 CET 2002
 " Filenames:    *.tpl
-" URL:		http://www.dwerg.net/projects/vim/smarty.vim
+" URL:		http://www.dwerg.net/projects/mnv/smarty.mnv
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -17,7 +17,7 @@ endif
 
 syn case ignore
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 "syn cluster htmlPreproc add=smartyUnZone
 
 syn match smartyBlock contained "[\[\]]"
@@ -73,4 +73,4 @@ if main_syntax == 'smarty'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/smcl.vim b/uvim/runtime/syntax/smcl.mnv
index a5baa47e96..30fb4dd028 100644
--- a/uvim/runtime/syntax/smcl.vim
+++ b/uvim/runtime/syntax/smcl.mnv
@@ -1,4 +1,4 @@
-" smcl.vim -- Vim syntax file for smcl files.
+" smcl.mnv -- MNV syntax file for smcl files.
 " Language:	SMCL -- Stata Markup and Control Language
 " Maintainer:	Jeff Pitblado <jpitblado@stata.com>
 " Last Change:	26apr2006
@@ -304,4 +304,4 @@ hi def link smclString		String
 
 let b:current_syntax = "smcl"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/smil.vim b/uvim/runtime/syntax/smil.mnv
index 4cf6e84710..3dad35b8af 100644
--- a/uvim/runtime/syntax/smil.vim
+++ b/uvim/runtime/syntax/smil.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SMIL (Synchronized Multimedia Integration Language)
 " Maintainer:	Herve Foucher <Herve.Foucher@helio.org>
-" URL:		http://www.helio.org/vim/syntax/smil.vim
+" URL:		http://www.helio.org/mnv/syntax/smil.mnv
 " Last Change:	2012 Feb 03 by Thilo Six
 
 " To learn more about SMIL, please refer to http://www.w3.org/AudioVideo/
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " SMIL is case sensitive
 syn case match
@@ -143,4 +143,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/smith.vim b/uvim/runtime/syntax/smith.mnv
index b045d3b963..b38629f453 100644
--- a/uvim/runtime/syntax/smith.vim
+++ b/uvim/runtime/syntax/smith.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SMITH
 " Maintainer:	Rafal M. Sulejman <rms@poczta.onet.pl>
 " Last Change:	21.07.2000
@@ -36,4 +36,4 @@ hi def link smithNumber	Number
 
 let b:current_syntax = "smith"
 
-" vim: ts=2
+" mnv: ts=2
diff --git a/uvim/runtime/syntax/sml.vim b/uvim/runtime/syntax/sml.mnv
index 5d80ebe475..396ed26809 100644
--- a/uvim/runtime/syntax/sml.vim
+++ b/uvim/runtime/syntax/sml.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     SML
 " Filenames:    *.sml *.sig
 " Maintainer:   Markus Mottl <markus.mottl@gmail.com>
@@ -239,4 +239,4 @@ hi def link smlEncl         Keyword
 
 let b:current_syntax = "sml"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/snnsnet.vim b/uvim/runtime/syntax/snnsnet.mnv
index 9dc9e06e78..1c0e05a33e 100644
--- a/uvim/runtime/syntax/snnsnet.vim
+++ b/uvim/runtime/syntax/snnsnet.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SNNS network file
 " Maintainer:	Davide Alberani <alberanid@bigfoot.com>
 " Last Change:	28 Apr 2001
 " Version:	0.2
-" URL:		http://digilander.iol.it/alberanid/vim/syntax/snnsnet.vim
+" URL:		http://digilander.iol.it/alberanid/mnv/syntax/snnsnet.mnv
 "
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
@@ -64,4 +64,4 @@ hi def link snnsnetTodo		Todo
 
 let b:current_syntax = "snnsnet"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/snnspat.vim b/uvim/runtime/syntax/snnspat.mnv
index cb6e9c5bd1..446ed1bd9d 100644
--- a/uvim/runtime/syntax/snnspat.vim
+++ b/uvim/runtime/syntax/snnspat.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SNNS pattern file
 " Maintainer:	Davide Alberani <alberanid@bigfoot.com>
 " Last Change:	2012 Feb 03 by Thilo Six
 " Version:	0.2
-" URL:		http://digilander.iol.it/alberanid/vim/syntax/snnspat.vim
+" URL:		http://digilander.iol.it/alberanid/mnv/syntax/snnspat.mnv
 "
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " anything that isn't part of the header, a comment or a number
 " is wrong
@@ -59,4 +59,4 @@ let b:current_syntax = "snnspat"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/snnsres.vim b/uvim/runtime/syntax/snnsres.mnv
index 2f19b67dbe..f50d499e85 100644
--- a/uvim/runtime/syntax/snnsres.vim
+++ b/uvim/runtime/syntax/snnsres.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SNNS result file
 " Maintainer:	Davide Alberani <alberanid@bigfoot.com>
 " Last Change:	28 Apr 2001
 " Version:	0.2
-" URL:		http://digilander.iol.it/alberanid/vim/syntax/snnsres.vim
+" URL:		http://digilander.iol.it/alberanid/mnv/syntax/snnsres.mnv
 "
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
@@ -47,4 +47,4 @@ hi def link snnsresTodo		Todo
 
 let b:current_syntax = "snnsres"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/snobol4.vim b/uvim/runtime/syntax/snobol4.mnv
index 11ce2e0059..f87c7d65ad 100644
--- a/uvim/runtime/syntax/snobol4.vim
+++ b/uvim/runtime/syntax/snobol4.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     SNOBOL4
 " Maintainer:   Rafal Sulejman <rms@poczta.onet.pl>
-" Site: http://rms.republika.pl/vim/syntax/snobol4.vim
+" Site: http://rms.republika.pl/mnv/syntax/snobol4.mnv
 " Last change:  : Thu, 25 Jan 2018 14:21:24 +0100
 " Changes: 
 " - system variables updated for SNOBOL4 2.0+
@@ -110,4 +110,4 @@ endif
 
 
 let b:current_syntax = "snobol4"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/solidity.vim b/uvim/runtime/syntax/solidity.mnv
index 5391bba707..355a11fb60 100644
--- a/uvim/runtime/syntax/solidity.vim
+++ b/uvim/runtime/syntax/solidity.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Solidity
 " Maintainer:		Cothi (jiungdev@gmail.com)
-" Original Author:	tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim)
+" Original Author:	tomlion (https://github.com/tomlion/mnv-solidity/blob/master/syntax/solidity.mnv)
 " Last Change:		2025 Mar 25
 "
 " Contributors:
-"       Modified by thesis (https://github.com/thesis/vim-solidity/blob/main/indent/solidity.vim)
-"       Modified by S0AndS0 (https://github.com/S0AndS0/vim/blob/syntax-solidity-updates/runtime/syntax/solidity.vim)
+"       Modified by thesis (https://github.com/thesis/mnv-solidity/blob/main/indent/solidity.mnv)
+"       Modified by S0AndS0 (https://github.com/S0AndS0/mnv/blob/syntax-solidity-updates/runtime/syntax/solidity.mnv)
 
 if exists("b:current_syntax")
   finish
diff --git a/uvim/runtime/syntax/spajson.vim b/uvim/runtime/syntax/spajson.mnv
index 78ade5f929..2afb50574d 100644
--- a/uvim/runtime/syntax/spajson.vim
+++ b/uvim/runtime/syntax/spajson.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SPA JSON
 " Maintainer:	David Mandelberg <david@mandelberg.org>
 " Last Change:	2025 Mar 22
diff --git a/uvim/runtime/syntax/spec.vim b/uvim/runtime/syntax/spec.mnv
index bbd6d395ba..1b41bb80cb 100644
--- a/uvim/runtime/syntax/spec.vim
+++ b/uvim/runtime/syntax/spec.mnv
@@ -1,12 +1,12 @@
-" Filename:    spec.vim
-" Purpose:     Vim syntax file
+" Filename:    spec.mnv
+" Purpose:     MNV syntax file
 " Language:    SPEC: Build/install scripts for Linux RPM packages
 " Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
 " Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
 " Last Change: 2020 May 25
-"  2024 Sep 10 by Vim Project: add file triggers support, #15569
-"  2025 May 05 by Vim Project: update for rpm 4.2 #17258
-"  2025 Nov 09 by Vim Project: support for more distributions and tags #18703
+"  2024 Sep 10 by MNV Project: add file triggers support, #15569
+"  2025 May 05 by MNV Project: update for rpm 4.2 #17258
+"  2025 Nov 09 by MNV Project: support for more distributions and tags #18703
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -226,4 +226,4 @@ hi def link specListedFilesShare		Statement
 
 let b:current_syntax = "spec"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/specman.vim b/uvim/runtime/syntax/specman.mnv
index 79c94b7815..396c56b603 100644
--- a/uvim/runtime/syntax/specman.vim
+++ b/uvim/runtime/syntax/specman.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SPECMAN E-LANGUAGE
 " Maintainer:	Or Freund <or@mobilian.com ;omf@gmx.co.uk; OrMeir@yahoo.com>
 " Last Update: Wed Oct 24 2001
@@ -108,7 +108,7 @@ syn region  specmanString start=+"+  end=+"+
 
 
 "**********************************************************************
-" I took this section from c.vim but I didnt succeded to make it work
+" I took this section from c.mnv but I didnt succeded to make it work
 " ANY one who dare jumping to this deep watter is more than welocome!
 "**********************************************************************
 ""catch errors caused by wrong parenthesis and brackets
diff --git a/uvim/runtime/syntax/spice.vim b/uvim/runtime/syntax/spice.mnv
index 306039bc74..731c04e400 100644
--- a/uvim/runtime/syntax/spice.vim
+++ b/uvim/runtime/syntax/spice.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Spice circuit simulator input netlist
 " Maintainer:	Noam Halevy <Noam.Halevy.motorola.com>
 " Last Change:	2012 Jun 01
 " 		(Dominique Pelle added @Spell)
 "
-" This is based on sh.vim by Lennart Schultz
+" This is based on sh.mnv by Lennart Schultz
 " but greatly simplified
 
 " quit when a syntax file was already loaded
@@ -65,11 +65,11 @@ hi def link spiceOperator		Operator
 
 let b:current_syntax = "spice"
 
-" insert the following to $VIM/syntax/scripts.vim
+" insert the following to $MNV/syntax/scripts.mnv
 " to autodetect HSpice netlists and text listing output:
 "
 " " Spice netlists and text listings
 " elseif getline(1) =~ 'spice\>' || getline("$") =~ '^\.end'
-"   so <sfile>:p:h/spice.vim
+"   so <sfile>:p:h/spice.mnv
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/splint.vim b/uvim/runtime/syntax/splint.mnv
index 8eba57d288..4ce573a52e 100644
--- a/uvim/runtime/syntax/splint.vim
+++ b/uvim/runtime/syntax/splint.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	splint (C with lclint/splint Annotations)
 " Maintainer:	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 " Splint Home:	http://www.splint.org/
@@ -7,12 +7,12 @@
 
 " Note:		Splint annotated files are not detected by default.
 "		If you want to use this file for highlighting C code,
-"		please make sure splint.vim is sourced instead of c.vim,
+"		please make sure splint.mnv is sourced instead of c.mnv,
 "		for example by putting
-"			/* vim: set filetype=splint : */
+"			/* mnv: set filetype=splint : */
 "		at the end of your code or something like
 "			au! BufRead,BufNewFile *.c	setfiletype splint
-"		in your vimrc file or filetype.vim
+"		in your mnvrc file or filetype.mnv
 
 
 " quit when a syntax file was already loaded
@@ -21,10 +21,10 @@ if exists("b:current_syntax")
 endif
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 
 
-" FIXME: uses and changes several clusters defined in c.vim
+" FIXME: uses and changes several clusters defined in c.mnv
 "	so watch for changes there
 
 " TODO: make a little more grammar explicit
@@ -240,4 +240,4 @@ hi def link splintError		Error
 
 let b:current_syntax = "splint"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/spup.vim b/uvim/runtime/syntax/spup.mnv
index 222caa779e..dbbec5de6f 100644
--- a/uvim/runtime/syntax/spup.vim
+++ b/uvim/runtime/syntax/spup.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Speedup, plant simulator from AspenTech
 " Maintainer:   Stefan.Schwarzer <s.schwarzer@ndh.net>
-" URL:		http://www.ndh.net/home/sschwarzer/download/spup.vim
+" URL:		http://www.ndh.net/home/sschwarzer/download/spup.mnv
 " Last Change:  2012 Feb 03 by Thilo Six
-" Filename:     spup.vim
+" Filename:     spup.mnv
 
 " Bugs
 " - in the appropriate sections keywords are always highlighted
@@ -23,7 +23,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " don't highlight several keywords like subsections
 "let strict_subsections = 1
@@ -266,4 +266,4 @@ let b:current_syntax = "spup"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/spyce.vim b/uvim/runtime/syntax/spyce.mnv
index 169de199dc..415360d7ab 100644
--- a/uvim/runtime/syntax/spyce.vim
+++ b/uvim/runtime/syntax/spyce.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	   SPYCE
 " Maintainer:	 Rimon Barr <rimon AT acm DOT org>
 " URL:		     http://spyce.sourceforge.net
@@ -17,13 +17,13 @@ endif
 " Read the HTML syntax to start with
 let b:did_indent = 1	     " don't perform HTML indentation!
 let html_no_rendering = 1    " do not render <b>,<i>, etc...
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 syntax spell default  " added by Bram
 
 " include python
-syn include @Python <sfile>:p:h/python.vim
-syn include @Html <sfile>:p:h/html.vim
+syn include @Python <sfile>:p:h/python.mnv
+syn include @Html <sfile>:p:h/html.mnv
 
 " spyce definitions
 syn keyword spyceDirectiveKeyword include compact module import contained
diff --git a/uvim/runtime/syntax/sql.vim b/uvim/runtime/syntax/sql.mnv
index 6de3f4a5c0..26f5a175f9 100644
--- a/uvim/runtime/syntax/sql.vim
+++ b/uvim/runtime/syntax/sql.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file loader
+" MNV syntax file loader
 " Language:    SQL
 " Maintainer:  David Fishburn <fishburn at ianywhere dot com>
 " Last Change: Thu Sep 15 2005 10:30:02 AM
@@ -8,29 +8,29 @@
 "                  buffer local variable,
 "                  global variable,
 "              If the above exist, it will source the type specified.
-"              If none exist, it will source the default sql.vim file.
+"              If none exist, it will source the default sql.mnv file.
 "
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
     finish
 endif
 
-" Default to the standard Vim distribution file
+" Default to the standard MNV distribution file
 let filename = 'sqloracle'
 
 " Check for overrides.  Buffer variables have the highest priority.
 if exists("b:sql_type_override")
     " Check the runtimepath to see if the file exists
-    if globpath(&runtimepath, 'syntax/'.b:sql_type_override.'.vim') != ''
+    if globpath(&runtimepath, 'syntax/'.b:sql_type_override.'.mnv') != ''
         let filename = b:sql_type_override
     endif
 elseif exists("g:sql_type_default")
-    if globpath(&runtimepath, 'syntax/'.g:sql_type_default.'.vim') != ''
+    if globpath(&runtimepath, 'syntax/'.g:sql_type_default.'.mnv') != ''
         let filename = g:sql_type_default
     endif
 endif
 
 " Source the appropriate file
-exec 'runtime syntax/'.filename.'.vim'
+exec 'runtime syntax/'.filename.'.mnv'
 
-" vim:sw=4:
+" mnv:sw=4:
diff --git a/uvim/runtime/syntax/sqlanywhere.vim b/uvim/runtime/syntax/sqlanywhere.mnv
index e91a99de65..2fbddb14b0 100644
--- a/uvim/runtime/syntax/sqlanywhere.vim
+++ b/uvim/runtime/syntax/sqlanywhere.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    SQL, Adaptive Server Anywhere
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Maintainer:  David Fishburn <dfishburn dot mnv at gmail dot com>
 " Last Change: 2013 May 13
 " Version:     16.0.0
 
@@ -902,4 +902,4 @@ hi def link sqlOption	        PreProc
 
 let b:current_syntax = "sqlanywhere"
 
-" vim:sw=4:
+" mnv:sw=4:
diff --git a/uvim/runtime/syntax/sqlforms.vim b/uvim/runtime/syntax/sqlforms.mnv
index 6077dd1e94..7efbe6ea90 100644
--- a/uvim/runtime/syntax/sqlforms.vim
+++ b/uvim/runtime/syntax/sqlforms.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
-"    Language: SQL*Forms (Oracle 7), based on sql.vim (vim5.0)
+" MNV syntax file
+"    Language: SQL*Forms (Oracle 7), based on sql.mnv (mnv5.0)
 "  Maintainer: Austin Ziegler (austin@halostatue.ca)
 " Last Change: 2003 May 11
 " Prev Change: 19980710
-"	  URL: http://www.halostatue.ca/vim/syntax/proc.vim
+"	  URL: http://www.halostatue.ca/mnv/syntax/proc.mnv
 "
 " TODO Find a new maintainer who knows SQL*Forms.
 
@@ -149,4 +149,4 @@ hi def link sqlTriggers PreProc
 
 let b:current_syntax = "sqlforms"
 
-" vim: ts=8 sw=4
+" mnv: ts=8 sw=4
diff --git a/uvim/runtime/syntax/sqlhana.vim b/uvim/runtime/syntax/sqlhana.mnv
index 2e334bb56e..b5f5254e04 100644
--- a/uvim/runtime/syntax/sqlhana.vim
+++ b/uvim/runtime/syntax/sqlhana.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    SQL, SAP HANA In Memory Database
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Maintainer:  David Fishburn <dfishburn dot mnv at gmail dot com>
 " Last Change: 2012 Oct 23
 " Version:     SP4 b (Q2 2012)
-" Homepage:    http://www.vim.org/scripts/script.php?script_id=4275
+" Homepage:    http://www.mnv.org/scripts/script.php?script_id=4275
 
 " Description: Updated to SAP HANA SP4
 "
@@ -18,7 +18,7 @@ syn case ignore
 " These were pulled from the following SQL reference:
 "     http://help.sap.com/hana/hana_sql_en.pdf
 " An easy approach is to copy all text from the PDF
-" into a Vim buffer.  The keywords are in UPPER case,
+" into a MNV buffer.  The keywords are in UPPER case,
 " so you can run the following commands to be left with
 " mainly the UPPER case words:
 "   1.  Delete all words that do not begin with a Capital
@@ -39,7 +39,7 @@ syn case ignore
 "   7.  Sort and remove duplicates
 "       :sort
 "       :Uniq
-"   8.  Use the WhatsMissing plugin against the sqlhana.vim file.
+"   8.  Use the WhatsMissing plugin against the sqlhana.mnv file.
 "   9.  Generated a file of all UPPER cased words which should not
 "       be in the syntax file.  These items should be removed
 "       from the list in step 7.  You can use WhatsNotMissing
@@ -287,4 +287,4 @@ hi def link sqlOption	        PreProc
 
 let b:current_syntax = "sqlhana"
 
-" vim:sw=4:
+" mnv:sw=4:
diff --git a/uvim/runtime/syntax/sqlinformix.vim b/uvim/runtime/syntax/sqlinformix.mnv
index 71418c556f..b0183ddd9e 100644
--- a/uvim/runtime/syntax/sqlinformix.vim
+++ b/uvim/runtime/syntax/sqlinformix.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Informix Structured Query Language (SQL) and Stored Procedure Language (SPL)
 " Language:	SQL, SPL (Informix Dynamic Server 2000 v9.2)
 " Maintainer:	Dean Hill <dhill@hotmail.com>
diff --git a/uvim/runtime/syntax/sqlj.vim b/uvim/runtime/syntax/sqlj.mnv
index fd0f8f3d76..8110ceff2d 100644
--- a/uvim/runtime/syntax/sqlj.vim
+++ b/uvim/runtime/syntax/sqlj.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	sqlj
 " Maintainer:	Andreas Fischbach <afisch@altavista.com>
-"		This file is based on sql.vim && java.vim (thanx)
+"		This file is based on sql.mnv && java.mnv (thanx)
 "		with a handful of additional sql words and still
 "		a subset of whatever standard
 " Last change:	31th Dec 2001
 
-" au BufNewFile,BufRead *.sqlj so $VIM/syntax/sqlj.vim
+" au BufNewFile,BufRead *.sqlj so $MNV/syntax/sqlj.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the Java syntax to start with
-source <sfile>:p:h/java.vim
+source <sfile>:p:h/java.mnv
 
 " SQLJ extensions
 " The SQL reserved words, defined as keywords.
diff --git a/uvim/runtime/syntax/sqloracle.vim b/uvim/runtime/syntax/sqloracle.mnv
index d523a4528a..f78d3a7d63 100644
--- a/uvim/runtime/syntax/sqloracle.vim
+++ b/uvim/runtime/syntax/sqloracle.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SQL, PL/SQL (Oracle 11g)
 " Maintainer:	Christian Brabandt
-" Repository:   https://github.com/chrisbra/vim-sqloracle-syntax
-" License:      Vim
+" Repository:   https://github.com/chrisbra/mnv-sqloracle-syntax
+" License:      MNV
 " Previous Maintainer:	Paul Moore
 " Last Change:	2022 February 10
 
@@ -12,7 +12,7 @@
 " 22.07.2016: Support Oracle Q-Quote-Syntax
 " 25.07.2016: Support for Oracle N'-Quote syntax
 " 22.06.2018: Remove skip part for sqlString (do not escape strings)
-" 10.02.2022: Add some more Oracle SQLKeywords https://github.com/vim/vim/issues/9737
+" 10.02.2022: Add some more Oracle SQLKeywords https://github.com/Project-Tick/Project-Tick/issues/9737
 " (https://web.archive.org/web/20150922065035/https://mariadb.com/kb/en/sql-99/character-string-literals/)
 
 if exists("b:current_syntax")
@@ -148,4 +148,4 @@ hi def link sqlType		Type
 hi def link sqlTodo		Todo
 
 let b:current_syntax = "sql"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/sqr.vim b/uvim/runtime/syntax/sqr.mnv
index 40b48358c6..0158b32229 100644
--- a/uvim/runtime/syntax/sqr.vim
+++ b/uvim/runtime/syntax/sqr.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 "    Language: Structured Query Report Writer (SQR)
 "  Maintainer: Nathan Stratton Treadway (nathanst at ontko dot com)
 "	  URL: http://www.ontko.com/sqr/#editor_config_files
@@ -13,7 +13,7 @@
 "		   {} variables can occur inside of '...' literals
 "
 "  Thanks to the previous maintainer of this file, Jeff Lanzarotta:
-"    http://lanzarotta.tripod.com/vim.html
+"    http://lanzarotta.tripod.com/mnv.html
 "    jefflanzarotta at yahoo dot com
 
 " quit when a syntax file was already loaded
@@ -27,7 +27,7 @@ syn case ignore
 
 " BEGIN GENERATED SECTION ============================================
 
-" Generated by generate_vim_syntax.sqr at 2002/04/11 13:04
+" Generated by generate_mnv_syntax.sqr at 2002/04/11 13:04
 " (based on the UltraEdit syntax file for SQR 6.1.4
 " found at http://www.ontko.com/sqr/#editor_config_files )
 
@@ -259,4 +259,4 @@ hi def link sqrError Error
 
 let b:current_syntax = "sqr"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/squid.vim b/uvim/runtime/syntax/squid.mnv
index 186be91e61..b663a003ed 100644
--- a/uvim/runtime/syntax/squid.vim
+++ b/uvim/runtime/syntax/squid.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Squid config file
 " Maintainer:	Klaus Muth <klaus@hampft.de>
 " Last Change:	2005 Jun 12
-" URL:		http://www.hampft.de/vim/syntax/squid.vim
+" URL:		http://www.hampft.de/mnv/syntax/squid.mnv
 " ThanksTo:	Ilya Sher <iso8601@mail.ru>,
 "               Michael Dotzler <Michael.Dotzler@leoni.com>
 
@@ -137,4 +137,4 @@ hi def link squidRegexOpt	Special
 
 let b:current_syntax = "squid"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/squirrel.vim b/uvim/runtime/syntax/squirrel.mnv
index 85bdd87d9e..d7d096e8d1 100644
--- a/uvim/runtime/syntax/squirrel.vim
+++ b/uvim/runtime/syntax/squirrel.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language: squirrel
 " Current Maintainer: Matt Dunford (zenmatic@gmail.com)
-" URL: https://github.com/zenmatic/vim-syntax-squirrel
+" URL: https://github.com/zenmatic/mnv-syntax-squirrel
 " Last Change:	2023 Dec 08
 
 " http://squirrel-lang.org/
@@ -11,11 +11,11 @@ if exists("b:current_syntax")
   finish
 endif
 
-" inform C syntax that the file was included from cpp.vim
+" inform C syntax that the file was included from cpp.mnv
 let b:filetype_in_cpp_family = 1
 
 " Read the C syntax to start with
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 unlet b:current_syntax
 unlet b:filetype_in_cpp_family
 
@@ -48,4 +48,4 @@ hi def link squirrelShComment		Comment
 
 let b:current_syntax = "squirrel"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/srec.vim b/uvim/runtime/syntax/srec.mnv
index 6ac22d9062..5512477575 100644
--- a/uvim/runtime/syntax/srec.vim
+++ b/uvim/runtime/syntax/srec.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Motorola S-Record
 " Maintainer:	Markus Heidelberg <markus.heidelberg@web.de>
 " Last Change:	2015 Feb 24
@@ -80,4 +80,4 @@ hi def link srecChecksum            DiffChange
 
 let b:current_syntax = "srec"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/srt.vim b/uvim/runtime/syntax/srt.mnv
index 12fb264d8e..875d1597a9 100644
--- a/uvim/runtime/syntax/srt.vim
+++ b/uvim/runtime/syntax/srt.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SubRip
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.srt
diff --git a/uvim/runtime/syntax/ssa.vim b/uvim/runtime/syntax/ssa.mnv
index 3cfae816ff..f26c28198e 100644
--- a/uvim/runtime/syntax/ssa.vim
+++ b/uvim/runtime/syntax/ssa.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SubStation Alpha
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.ass,*.ssa
diff --git a/uvim/runtime/syntax/sshconfig.vim b/uvim/runtime/syntax/sshconfig.mnv
index 291a1a636a..3d9087baf2 100644
--- a/uvim/runtime/syntax/sshconfig.vim
+++ b/uvim/runtime/syntax/sshconfig.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenSSH client configuration file (ssh_config)
 " Author:	David Necas (Yeti)
 " Maintainer:	Jakub Jelen <jakuje at gmail dot com>
@@ -301,4 +301,4 @@ hi def link sshconfigDeprecated     Error
 
 let b:current_syntax = "sshconfig"
 
-" vim:set ts=8 sw=2 sts=2:
+" mnv:set ts=8 sw=2 sts=2:
diff --git a/uvim/runtime/syntax/sshdconfig.vim b/uvim/runtime/syntax/sshdconfig.mnv
index 464aa764c8..d6f7d012ec 100644
--- a/uvim/runtime/syntax/sshdconfig.vim
+++ b/uvim/runtime/syntax/sshdconfig.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenSSH server configuration file (sshd_config)
 " Author:	David Necas (Yeti)
 " Maintainer:	Jakub Jelen <jakuje at gmail dot com>
@@ -307,4 +307,4 @@ hi def link sshdconfigDeprecated           Error
 
 let b:current_syntax = "sshdconfig"
 
-" vim:set ts=8 sw=2 sts=2:
+" mnv:set ts=8 sw=2 sts=2:
diff --git a/uvim/runtime/syntax/st.vim b/uvim/runtime/syntax/st.mnv
index ffa7820fe8..205cf76797 100644
--- a/uvim/runtime/syntax/st.vim
+++ b/uvim/runtime/syntax/st.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Smalltalk
 " Maintainer:	Arndt Hesse <hesse@self.de>
 " Last Change:	2012 Feb 12 by Thilo Six
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " some Smalltalk keywords and standard methods
 syn keyword	stKeyword	super self class true false new not
diff --git a/uvim/runtime/syntax/stata.vim b/uvim/runtime/syntax/stata.mnv
index 29f5052ebe..1ef7d068a7 100644
--- a/uvim/runtime/syntax/stata.vim
+++ b/uvim/runtime/syntax/stata.mnv
@@ -1,4 +1,4 @@
-" stata.vim -- Vim syntax file for Stata do, ado, and class files.
+" stata.mnv -- MNV syntax file for Stata do, ado, and class files.
 " Language:	Stata and/or Mata
 " Maintainer:	Jeff Pitblado <jpitblado@stata.com>
 " Last Change:	26apr2006
@@ -409,7 +409,7 @@ syn region stataFunc matchgroup=Function start=/\<vec(/ end=/)/ contains=@stataF
 syn region stataFunc matchgroup=Function start=/\<vecdiag(/ end=/)/ contains=@stataFuncGroup
 
 " Errors to catch
-" taken from $VIMRUNTIME/syntax/c.vim 
+" taken from $MNVRUNTIME/syntax/c.mnv 
 " catch errors caused by wrong parenthesis, braces and brackets
 syn region	stataParen	transparent start=/(/ end=/)/  contains=ALLBUT,@stataParenGroup,stataErrInBracket,stataErrInBrace
 syn region	stataBracket	transparent start=/\[/ end=/]/ contains=ALLBUT,@stataParenGroup,stataErrInParen,stataErrInBrace
@@ -447,4 +447,4 @@ hi def link stataString		String
 
 let b:current_syntax = "stata"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/stp.vim b/uvim/runtime/syntax/stp.mnv
index 2992d8be47..f6ddc85a51 100644
--- a/uvim/runtime/syntax/stp.vim
+++ b/uvim/runtime/syntax/stp.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 "    Language: Stored Procedures (STP)
 "  Maintainer: Jeff Lanzarotta (jefflanzarotta@yahoo.com)
-"	  URL: http://lanzarotta.tripod.com/vim/syntax/stp.vim.zip
+"	  URL: http://lanzarotta.tripod.com/mnv/syntax/stp.mnv.zip
 " Last Change: March 05, 2002
 
 " quit when a syntax file was already loaded
@@ -151,4 +151,4 @@ hi def link stpRepeat Repeat
 
 let b:current_syntax = "stp"
 
-" vim ts=8 sw=2
+" mnv ts=8 sw=2
diff --git a/uvim/runtime/syntax/strace.vim b/uvim/runtime/syntax/strace.mnv
index 20516a1853..0c0da30d44 100644
--- a/uvim/runtime/syntax/strace.vim
+++ b/uvim/runtime/syntax/strace.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: strace output
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2022 Jan 29
diff --git a/uvim/runtime/syntax/structurizr.vim b/uvim/runtime/syntax/structurizr.mnv
index c10f1a4569..dd6e1e27fd 100644
--- a/uvim/runtime/syntax/structurizr.vim
+++ b/uvim/runtime/syntax/structurizr.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      Structurizr DSL
 " Maintainer:    Bastian Venthur <venthur@debian.org>
 " Last Change:   2024-11-06
diff --git a/uvim/runtime/syntax/stylus.vim b/uvim/runtime/syntax/stylus.mnv
index d8bf641e60..43a1c4d816 100644
--- a/uvim/runtime/syntax/stylus.vim
+++ b/uvim/runtime/syntax/stylus.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Stylus
 " Maintainer:	Hsiaoming Yang <lepture@me.com>, Marc Harter
 " Filenames: *.styl, *.stylus
-" Based On: Tim Pope (sass.vim)
+" Based On: Tim Pope (sass.mnv)
 " Created:	Dec 14, 2011
 " Modified:	May 28, 2024
 
@@ -48,4 +48,4 @@ syn region stylusComment    start="//" end="$" contains=cssTodo,@Spell fold
 
 let b:current_syntax = "stylus"
 
-" vim:set sw=2:
+" mnv:set sw=2:
diff --git a/uvim/runtime/syntax/sudoers.vim b/uvim/runtime/syntax/sudoers.mnv
index 98ab29c6b6..d4d2be970c 100644
--- a/uvim/runtime/syntax/sudoers.vim
+++ b/uvim/runtime/syntax/sudoers.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             sudoers(5) configuration files
-" Maintainer:           Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
+" Maintainer:           Eisuke Kawashima ( e.kawaschima+mnv AT gmail.com )
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Change:        2026 Mar 11
 
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " TODO: instead of 'skipnl', we would like to match a specific group that would
 " match \\$ and then continue with the nextgroup, actually, the skipnl doesn't
diff --git a/uvim/runtime/syntax/svg.vim b/uvim/runtime/syntax/svg.mnv
index 819b5ec987..79ff4819c4 100644
--- a/uvim/runtime/syntax/svg.vim
+++ b/uvim/runtime/syntax/svg.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SVG (Scalable Vector Graphics)
 " Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:	.svg (used in Web and vector programs)
@@ -11,5 +11,5 @@ if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/xml.vim
+runtime! syntax/xml.mnv
 let b:current_syntax = "svg"
diff --git a/uvim/runtime/syntax/svn.vim b/uvim/runtime/syntax/svn.mnv
index 6239790f12..5e785a1586 100644
--- a/uvim/runtime/syntax/svn.vim
+++ b/uvim/runtime/syntax/svn.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Subversion (svn) commit file
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
-" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/svn.vim
+" URL:          https://github.com/hdima/mnv-scripts/blob/master/syntax/svn.mnv
 " Last Change:  2013-11-08
 " Filenames:    svn-commit*.tmp
 " Version:      1.10
diff --git a/uvim/runtime/syntax/swayconfig.vim b/uvim/runtime/syntax/swayconfig.mnv
index 5dd9760f56..abb004331a 100644
--- a/uvim/runtime/syntax/swayconfig.vim
+++ b/uvim/runtime/syntax/swayconfig.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language: sway config file
-" Original Author: Josef Litos (litoj/i3config.vim)
+" Original Author: Josef Litos (litoj/i3config.mnv)
 " Maintainer: James Eapen <james.eapen@vai.org>
 " Version: 1.2.7
 " Last Change: 2025-12-02
@@ -8,7 +8,7 @@
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
 " https://github.com/swaywm/sway/blob/b69d637f7a34e239e48a4267ae94a5e7087b5834/sway/sway.5.scd
-" http://vimdoc.sourceforge.net/htmldoc/syntax.html
+" http://mnvdoc.sourceforge.net/htmldoc/syntax.html
 "
 "
 " Quit when a syntax file was already loaded
@@ -19,7 +19,7 @@ endif
 " before i3 load to give i3ConfigKeyword lower priority
 syn cluster i3ConfigCommand contains=i3ConfigCommand,i3ConfigAction,i3ConfigActionKeyword,@i3ConfigValue,i3ConfigColor,i3ConfigKeyword
 
-runtime! syntax/i3config.vim
+runtime! syntax/i3config.mnv
 
 " In sway, popup_during_fullscreen does not have options like all option.
 syn cluster i3ConfigPopupFullscreenOpts remove=i3ConfigPopupFullscreenOptsExtra
diff --git a/uvim/runtime/syntax/swift.vim b/uvim/runtime/syntax/swift.mnv
index ff07be29fa..eaa1b60099 100644
--- a/uvim/runtime/syntax/swift.vim
+++ b/uvim/runtime/syntax/swift.mnv
@@ -6,19 +6,19 @@
 " See https://swift.org/LICENSE.txt for license information
 " See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 "
-" Vim syntax file
+" MNV syntax file
 " Language: swift
 " Maintainer: Joe Groff <jgroff@apple.com>
 " Last Change: 2018 Jan 21
 "
-" Vim maintainer: Emir SARI <bitigchi@me.com>
+" MNV maintainer: Emir SARI <bitigchi@me.com>
 
 if exists("b:current_syntax")
     finish
 endif
 
 let s:keepcpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword swiftKeyword
       \ break
diff --git a/uvim/runtime/syntax/swiftgyb.vim b/uvim/runtime/syntax/swiftgyb.mnv
index 566b75b2ed..c1b34347e3 100644
--- a/uvim/runtime/syntax/swiftgyb.vim
+++ b/uvim/runtime/syntax/swiftgyb.mnv
@@ -6,15 +6,15 @@
 " See https://swift.org/LICENSE.txt for license information
 " See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 "
-" Vim syntax file
+" MNV syntax file
 " Language: gyb on swift
 "
-" Vim maintainer: Emir SARI <bitigchi@me.com>
+" MNV maintainer: Emir SARI <bitigchi@me.com>
 
-runtime! syntax/swift.vim
+runtime! syntax/swift.mnv
 unlet b:current_syntax
 
-syn include @Python syntax/python.vim
+syn include @Python syntax/python.mnv
 syn region pythonCode matchgroup=gybPythonCode start=+^ *%+ end=+$+ contains=@Python keepend
 syn region pythonCode matchgroup=gybPythonCode start=+%{+ end=+}%+ contains=@Python keepend
 syn match gybPythonCode /\${[^}]*}/
diff --git a/uvim/runtime/syntax/swig.vim b/uvim/runtime/syntax/swig.mnv
index b62621264a..da105c1667 100644
--- a/uvim/runtime/syntax/swig.vim
+++ b/uvim/runtime/syntax/swig.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	SWIG
 " Maintainer:	Julien Marrec <julien.marrec 'at' gmail com>
 " Last Change:	2023 November 23
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C++ syntax to start with
-runtime! syntax/cpp.vim
+runtime! syntax/cpp.mnv
 unlet b:current_syntax
 
 " SWIG extentions
@@ -96,4 +96,4 @@ hi def link swigVerbatimMacro Macro
 hi def link swigTypeMapVars SpecialChar
 
 let b:current_syntax = "swig"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/syncolor.vim b/uvim/runtime/syntax/syncolor.mnv
index 8b0beb88d9..3c6318d57a 100644
--- a/uvim/runtime/syntax/syncolor.vim
+++ b/uvim/runtime/syntax/syncolor.mnv
@@ -1,14 +1,14 @@
-" Vim syntax support file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax support file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " This file sets up the default methods for highlighting.
-" It is loaded from "synload.vim" and from Vim for ":syntax reset".
+" It is loaded from "synload.mnv" and from MNV for ":syntax reset".
 " Also used from init_highlight().
 
 if !exists("syntax_cmd") || syntax_cmd == "on"
-  " ":syntax on" works like in Vim 5.7: set colors but keep links
+  " ":syntax on" works like in MNV 5.7: set colors but keep links
   command -nargs=* SynColor hi <args>
   command -nargs=* SynLink hi link <args>
 else
diff --git a/uvim/runtime/syntax/synload.vim b/uvim/runtime/syntax/synload.mnv
index 553e8b209e..6a872caf5e 100644
--- a/uvim/runtime/syntax/synload.vim
+++ b/uvim/runtime/syntax/synload.mnv
@@ -1,10 +1,10 @@
-" Vim syntax support file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax support file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " This file sets up for syntax highlighting.
-" It is loaded from "syntax.vim" and "manual.vim".
+" It is loaded from "syntax.mnv" and "manual.mnv".
 " 1. Set the default highlight groups.
 " 2. Install Syntax autocommands for all the available syntax files.
 
@@ -19,12 +19,12 @@ let syntax_on = 1
 if exists("colors_name")
   exe "colors " . colors_name
 else
-  runtime! syntax/syncolor.vim
+  runtime! syntax/syncolor.mnv
 endif
 
 " Line continuation is used here, remove 'C' from 'cpoptions'
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " First remove all old syntax autocommands.
 au! Syntax
@@ -56,7 +56,7 @@ fun! s:SynSet()
     " load each in sequence.  Skip empty entries.
     for name in split(s, '\.')
       if !empty(name)
-	exe "runtime! syntax/" . name . ".vim syntax/" . name . "/*.vim"
+	exe "runtime! syntax/" . name . ".mnv syntax/" . name . "/*.mnv"
       endif
     endfor
   endif
@@ -67,7 +67,7 @@ endfun
 au Syntax c,cpp,cs,idl,java,php,datascript
 	\ if (exists('b:load_doxygen_syntax') && b:load_doxygen_syntax)
 	\	|| (exists('g:load_doxygen_syntax') && g:load_doxygen_syntax)
-	\   | runtime! syntax/doxygen.vim
+	\   | runtime! syntax/doxygen.mnv
 	\ | endif
 
 
diff --git a/uvim/runtime/syntax/syntax.vim b/uvim/runtime/syntax/syntax.mnv
index 06b8d8f11f..a82f862b72 100644
--- a/uvim/runtime/syntax/syntax.vim
+++ b/uvim/runtime/syntax/syntax.mnv
@@ -1,7 +1,7 @@
-" Vim syntax support file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" MNV syntax support file
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " This file is used for ":syntax on".
 " It installs the autocommands and starts highlighting for all buffers.
@@ -13,11 +13,11 @@ endif
 " If Syntax highlighting appears to be on already, turn it off first, so that
 " any leftovers are cleared.
 if exists("syntax_on") || exists("syntax_manual")
-  so <sfile>:p:h/nosyntax.vim
+  so <sfile>:p:h/nosyntax.mnv
 endif
 
 " Load the Syntax autocommands and set the default methods for highlighting.
-runtime syntax/synload.vim
+runtime syntax/synload.mnv
 
 " Load the FileType autocommands if not done yet.
 if exists("did_load_filetypes")
diff --git a/uvim/runtime/syntax/sysctl.vim b/uvim/runtime/syntax/sysctl.mnv
index d99ac01835..534a6c8df7 100644
--- a/uvim/runtime/syntax/sysctl.vim
+++ b/uvim/runtime/syntax/sysctl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             sysctl.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2011-05-02
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   sysctlBegin   display '^'
                           \ nextgroup=sysctlToken,sysctlComment skipwhite
diff --git a/uvim/runtime/syntax/systemd.vim b/uvim/runtime/syntax/systemd.mnv
index 5dfba74408..f7f6a92755 100644
--- a/uvim/runtime/syntax/systemd.vim
+++ b/uvim/runtime/syntax/systemd.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:  systemd.unit(5)
 
 if !exists('b:current_syntax')
   " Looks a lot like dosini files.
-  runtime! syntax/dosini.vim
+  runtime! syntax/dosini.mnv
   let b:current_syntax = 'systemd'
 endif
diff --git a/uvim/runtime/syntax/systemverilog.vim b/uvim/runtime/syntax/systemverilog.mnv
index 94c343e01a..2bc695120a 100644
--- a/uvim/runtime/syntax/systemverilog.vim
+++ b/uvim/runtime/syntax/systemverilog.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    SystemVerilog
 " Maintainer:  kocha <kocha.lsifrontend@gmail.com>
 " Last Change: 12-Aug-2013.
-" 2025 Aug 20 by Vim project: Add IEE1800-2023 block #18056
+" 2025 Aug 20 by MNV project: Add IEE1800-2023 block #18056
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " Read in Verilog syntax files
-runtime! syntax/verilog.vim
+runtime! syntax/verilog.mnv
 unlet b:current_syntax
 
 " IEEE1800-2005
@@ -87,4 +87,4 @@ hi def link systemverilogBlockString     String
 
 let b:current_syntax = "systemverilog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/tads.vim b/uvim/runtime/syntax/tads.mnv
index 23a65b99ec..fc3a9f814e 100644
--- a/uvim/runtime/syntax/tads.vim
+++ b/uvim/runtime/syntax/tads.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TADS
 " Maintainer:	Amir Karger <karger@post.harvard.edu>
 " $Date: 2004/06/13 19:28:45 $
 " $Revision: 1.1 $
 " Stolen from: Bram Moolenaar's C language file
-" Newest version at: http://www.hec.utah.edu/~karger/vim/syntax/tads.vim
+" Newest version at: http://www.hec.utah.edu/~karger/mnv/syntax/tads.mnv
 " History info at the bottom of the file
 
 " TODO lots more keywords
@@ -168,4 +168,4 @@ let b:current_syntax = "tads"
 " 11/18/99 Added a bunch of TADS functions, tadsException
 " 10/22/99 Misspelled Moolenaar (sorry!), c_minlines to tads_minlines
 "
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/tags.vim b/uvim/runtime/syntax/tags.mnv
index e87e3fcf61..f1532401a0 100644
--- a/uvim/runtime/syntax/tags.vim
+++ b/uvim/runtime/syntax/tags.mnv
@@ -2,9 +2,9 @@
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:	Charles E. Campbell
 " Last Change:	Oct 26, 2016
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:		8
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/uvim/runtime/syntax/tak.vim b/uvim/runtime/syntax/tak.mnv
index 7a8fceb860..615393b5e5 100644
--- a/uvim/runtime/syntax/tak.vim
+++ b/uvim/runtime/syntax/tak.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TAK2, TAK3, TAK2000 thermal modeling input file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.tak
-" URL:		http://www.naglenet.org/vim/syntax/tak.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/tak.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -29,7 +29,7 @@ syn case ignore
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-runtime! syntax/fortran.vim
+runtime! syntax/fortran.mnv
 unlet b:current_syntax
 
 
@@ -116,4 +116,4 @@ hi def link takTodo		Todo
 
 let b:current_syntax = "tak"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/takcmp.vim b/uvim/runtime/syntax/takcmp.mnv
index 9426e02223..010ac997f9 100644
--- a/uvim/runtime/syntax/takcmp.vim
+++ b/uvim/runtime/syntax/takcmp.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TAK2, TAK3, TAK2000 thermal modeling compare file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.cmp
-" URL:		http://www.naglenet.org/vim/syntax/takcmp.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/takcmp.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -66,4 +66,4 @@ hi def link takcmpFloat		   Special
 
 let b:current_syntax = "takcmp"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/takout.vim b/uvim/runtime/syntax/takout.mnv
index 5e5d360767..f492d7bf22 100644
--- a/uvim/runtime/syntax/takout.vim
+++ b/uvim/runtime/syntax/takout.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TAK2, TAK3, TAK2000 thermal modeling output file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.out
-" URL:		http://www.naglenet.org/vim/syntax/takout.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/takout.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -21,7 +21,7 @@ syn case match
 
 
 " Load TAK syntax file
-runtime! syntax/tak.vim
+runtime! syntax/tak.mnv
 unlet b:current_syntax
 
 
@@ -82,4 +82,4 @@ hi def link takoutError		   Error
 
 let b:current_syntax = "takout"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/tap.vim b/uvim/runtime/syntax/tap.mnv
index 6b00b1d588..8e38551a5e 100644
--- a/uvim/runtime/syntax/tap.vim
+++ b/uvim/runtime/syntax/tap.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Verbose TAP Output
 " Maintainer:  Rufus Cable <rufus@threebytesfull.com>
 " Remark:      Simple syntax highlighting for TAP output
-" License:     Vim License (see :help license)
+" License:     MNV License (see :help license)
 " Copyright:   (c) 2008-2013 Rufus Cable
 " Last Change: 2020 Mar 15
 
diff --git a/uvim/runtime/syntax/tar.vim b/uvim/runtime/syntax/tar.mnv
index 815c2219cb..a2e034e67e 100644
--- a/uvim/runtime/syntax/tar.vim
+++ b/uvim/runtime/syntax/tar.mnv
@@ -16,4 +16,4 @@ hi def link tarDirectory Type
 
 let b:current_syntax = 'tar'
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/taskdata.vim b/uvim/runtime/syntax/taskdata.mnv
index 63a8284adf..8be3e966ce 100644
--- a/uvim/runtime/syntax/taskdata.vim
+++ b/uvim/runtime/syntax/taskdata.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	task data
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Key Names for values.
 syn keyword taskdataKey		description due end entry imask mask parent
@@ -42,4 +42,4 @@ let b:current_syntax = "taskdata"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:noexpandtab
+" mnv:noexpandtab
diff --git a/uvim/runtime/syntax/taskedit.vim b/uvim/runtime/syntax/taskedit.mnv
index d33ca78650..9fbe1796f2 100644
--- a/uvim/runtime/syntax/taskedit.vim
+++ b/uvim/runtime/syntax/taskedit.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	support for 'task 42 edit'
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:32 EDT 2009
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match taskeditHeading	"^\s*#\s*Name\s\+Editable details\s*$" contained
 syn match taskeditHeading	"^\s*#\s*-\+\s\+-\+\s*$" contained
@@ -34,4 +34,4 @@ let b:current_syntax = "taskedit"
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim:noexpandtab
+" mnv:noexpandtab
diff --git a/uvim/runtime/syntax/tasm.vim b/uvim/runtime/syntax/tasm.mnv
index b8b5e6992b..77644eebd5 100644
--- a/uvim/runtime/syntax/tasm.vim
+++ b/uvim/runtime/syntax/tasm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: TASM: turbo assembler by Borland
 " Maintainer: FooLman of United Force <foolman@bigfoot.com>
 " Last Change: 2012 Feb 03 by Thilo Six, and 2018 Nov 27.
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 syn match tasmLabel "^[\ \t]*[@a-z_$][a-z0-9_$@]*\ *:"
diff --git a/uvim/runtime/syntax/tcl.vim b/uvim/runtime/syntax/tcl.mnv
index 59cb04f70f..8dfcbcb42d 100644
--- a/uvim/runtime/syntax/tcl.vim
+++ b/uvim/runtime/syntax/tcl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Tcl/Tk
 " Maintainer:	Taylor Venable <taylor@metasyntax.net>
 " 		(previously Brett Cannon <brett@python.org>)
@@ -271,4 +271,4 @@ hi def link tclVarRef		Identifier
 
 let b:current_syntax = "tcl"
 
-" vim: ts=8 noet nolist
+" mnv: ts=8 noet nolist
diff --git a/uvim/runtime/syntax/tcsh.vim b/uvim/runtime/syntax/tcsh.mnv
index 70265e2910..601ce8cb82 100644
--- a/uvim/runtime/syntax/tcsh.vim
+++ b/uvim/runtime/syntax/tcsh.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		tcsh scripts
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" Previous Maintainer:	Gautam Iyer <gi1242+vim@NoSpam.com> where NoSpam=gmail (Original Author)
+" Previous Maintainer:	Gautam Iyer <gi1242+mnv@NoSpam.com> where NoSpam=gmail (Original Author)
 " Last Change:		2026 Jan 16
 
 " Description: We break up each statement into a "command" and an "end" part.
@@ -19,7 +19,7 @@ if exists('b:current_syntax')
 endif
 
 let s:oldcpo = &cpo
-set cpo&vim " Line continuation is used
+set cpo&mnv " Line continuation is used
 
 syn iskeyword @,48-57,_,192-255,-
 
@@ -50,7 +50,7 @@ syn keyword tcshBuiltin nextgroup=tcshStatementEnd alloc bg break breaksw builti
 syn region tcshStatementEnd	transparent contained matchgroup=tcshBuiltin start='' end='\v\\@<!(;|\|[|&]?|\&\&|$)' contains=@tcshStatementEnds
 
 " set expressions (Contains shell variables)
-syn keyword tcshShellVar contained addsuffix afsuser ampm anyerror argv autocorrect autoexpand autolist autologout autorehash backslash_quote catalog cdpath cdtohome color colorcat command compat_expr complete continue continue_args correct csubstnonl cwd dextract dirsfile dirstack dspmbyte dunique echo echo_style edit editors ellipsis euid euser fignore filec gid globdot globstar group highlight histchars histdup histfile histlit history home ignoreeof implicitcd inputmode killdup killring listflags listjobs listlinks listmax listmaxrows loginsh logout mail matchbeep nobeep noclobber noding noglob nokanji nonomatch nostat notify oid owd padhour parseoctal path printexitvalue prompt prompt2 prompt3 promptchars pushdtohome pushdsilent recexact recognize_only_executables rmstar rprompt savedirs savehist sched shell shlvl status symlinks tcsh term time tperiod tty uid user verbose version vimode visiblebell watch who wordchars
+syn keyword tcshShellVar contained addsuffix afsuser ampm anyerror argv autocorrect autoexpand autolist autologout autorehash backslash_quote catalog cdpath cdtohome color colorcat command compat_expr complete continue continue_args correct csubstnonl cwd dextract dirsfile dirstack dspmbyte dunique echo echo_style edit editors ellipsis euid euser fignore filec gid globdot globstar group highlight histchars histdup histfile histlit history home ignoreeof implicitcd inputmode killdup killring listflags listjobs listlinks listmax listmaxrows loginsh logout mail matchbeep nobeep noclobber noding noglob nokanji nonomatch nostat notify oid owd padhour parseoctal path printexitvalue prompt prompt2 prompt3 promptchars pushdtohome pushdsilent recexact recognize_only_executables rmstar rprompt savedirs savehist sched shell shlvl status symlinks tcsh term time tperiod tty uid user verbose version mnvode visiblebell watch who wordchars
 syn keyword tcshBuiltin	nextgroup=tcshSetEnd set unset
 syn region  tcshSetEnd	contained transparent matchgroup=tcshBuiltin start='' skip='\\$' end='$\|;' contains=tcshShellVar,@tcshStatementEnds
 
@@ -138,8 +138,8 @@ syn match tcshLabel     '^\s*\w\+:\ze\s*$'
 
 " ----- Strings ----- {{{1
 " Tcsh does not allow \" in strings unless the "backslash_quote" shell
-" variable is set. Set the vim variable "tcsh_backslash_quote" to 0 if you
-" want VIM to assume that no backslash quote constructs exist.
+" variable is set. Set the mnv variable "tcsh_backslash_quote" to 0 if you
+" want MNV to assume that no backslash quote constructs exist.
 
 " Backquotes are treated as commands, and are not contained in anything
 if get(g:, 'tcsh_backslash_quote', 1)
@@ -253,4 +253,4 @@ unlet s:oldcpo
 
 let b:current_syntax = 'tcsh'
 
-" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+" mnv: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/uvim/runtime/syntax/template.vim b/uvim/runtime/syntax/template.mnv
index a59b7b0af9..a41e9fe83e 100644
--- a/uvim/runtime/syntax/template.vim
+++ b/uvim/runtime/syntax/template.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Generic template
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -12,5 +12,5 @@ endif
 " Known template types are very similar to HTML, E.g. golang and "Xfire User
 " Interface Template"
 " If you know how to recognize a more specific type for *.tmpl suggest a
-" change to runtime/scripts.vim.
-runtime! syntax/html.vim
+" change to runtime/scripts.mnv.
+runtime! syntax/html.mnv
diff --git a/uvim/runtime/syntax/tera.vim b/uvim/runtime/syntax/tera.mnv
index e151e8674b..4120c3348d 100644
--- a/uvim/runtime/syntax/tera.vim
+++ b/uvim/runtime/syntax/tera.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Tera
 " Maintainer:	Muntasir Mahmud <muntasir.joypurhat@gmail.com>
 " Last Change:	2026 Jan 29
-" 2026 Mar 31 by Vim project: prevent code execution in filename
+" 2026 Mar 31 by MNV project: prevent code execution in filename
 
 if exists("b:current_syntax")
   finish
@@ -23,11 +23,11 @@ endif
 
 " Load the underlying language syntax if detected
 if s:underlying_filetype != ""
-  execute "runtime! syntax/" . fnameescape(s:underlying_filetype) . ".vim"
+  execute "runtime! syntax/" . fnameescape(s:underlying_filetype) . ".mnv"
   unlet! b:current_syntax
 else
   " Default to HTML if no specific language detected
-  runtime! syntax/html.vim
+  runtime! syntax/html.mnv
   unlet! b:current_syntax
 endif
 
diff --git a/uvim/runtime/syntax/teraterm.vim b/uvim/runtime/syntax/teraterm.mnv
index 9115320bfb..8416ed9f66 100644
--- a/uvim/runtime/syntax/teraterm.vim
+++ b/uvim/runtime/syntax/teraterm.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Tera Term Language (TTL)
 "		Based on Tera Term Version 4.100
 " Maintainer:	Ken Takata
-" URL:		https://github.com/k-takata/vim-teraterm
+" URL:		https://github.com/k-takata/mnv-teraterm
 " Last Change:	2018-08-31
 " Filenames:	*.ttl
-" License:	VIM License
+" License:	MNV License
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:save_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case ignore
 
@@ -137,4 +137,4 @@ let b:current_syntax = "teraterm"
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: ts=8 sw=2 sts=2
+" mnv: ts=8 sw=2 sts=2
diff --git a/uvim/runtime/syntax/terminfo.vim b/uvim/runtime/syntax/terminfo.mnv
index 2b0ab0860a..2a0931bf86 100644
--- a/uvim/runtime/syntax/terminfo.vim
+++ b/uvim/runtime/syntax/terminfo.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             terminfo(5) definition
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match terminfoKeywords      '[,=#|]'
 
diff --git a/uvim/runtime/syntax/terraform.vim b/uvim/runtime/syntax/terraform.mnv
index 1be5698d59..07d31d164a 100644
--- a/uvim/runtime/syntax/terraform.vim
+++ b/uvim/runtime/syntax/terraform.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Terraform
 " Maintainer:  Gregory Anders
-" Upstream:    https://github.com/hashivim/vim-terraform
+" Upstream:    https://github.com/hashimnv/mnv-terraform
 " Last Change: 2024-09-03
 " License:     ISC
 "
@@ -23,7 +23,7 @@ if exists('b:current_syntax')
   finish
 endif
 
-runtime! syntax/hcl.vim
+runtime! syntax/hcl.mnv
 
 syn keyword terraType string bool number object tuple list map set any
 
diff --git a/uvim/runtime/syntax/testdir/README.txt b/uvim/runtime/syntax/testdir/README.txt
index bd3730435f..16211fc90b 100644
--- a/uvim/runtime/syntax/testdir/README.txt
+++ b/uvim/runtime/syntax/testdir/README.txt
@@ -1,7 +1,7 @@
 Tests for syntax highlighting plugins
 =====================================
 
-Summary: Files in the "input" directory are edited by Vim with syntax
+Summary: Files in the "input" directory are edited by MNV with syntax
 highlighting enabled.  Screendumps are generated and compared with the
 expected screendumps in the "dumps" directory.  This will uncover any
 character attributes that differ.
@@ -34,7 +34,7 @@ Make sure to include some interesting constructs with plenty of complicated
 highlighting.  Optionally, pre-configure the testing environment by including
 setup commands at the top of the input file.  The format for these lines is:
 
-	VIM_TEST_SETUP {command}
+	MNV_TEST_SETUP {command}
 
 where {command} is any valid Ex command, which extends to the end of the line.
 The first 20 lines of the input file are ALWAYS scanned for setup commands and
@@ -44,22 +44,22 @@ errors in the input file but this is not required.
 
 Continuing the Java example:
 
-	// VIM_TEST_SETUP let g:java_space_errors = 1
-	// VIM_TEST_SETUP let g:java_minlines = 5
+	// MNV_TEST_SETUP let g:java_space_errors = 1
+	// MNV_TEST_SETUP let g:java_minlines = 5
 	class Test { }
 
-As an alternative, setup commands can be included in an external Vim script
+As an alternative, setup commands can be included in an external MNV script
 file in the "input/setup" directory.  This script file must have the same base
 name as the input file.
 
 So, the equivalent example configuration using this method would be to create
-an "input/setup/java.vim" script file with the following lines:
+an "input/setup/java.mnv" script file with the following lines:
 
 	let g:java_space_errors = 1
 	let g:java_minlines = 5
 
 Both inline setup commands and setup scripts may be used at the same time, the
-script file will be sourced before any VIM_TEST_SETUP commands are executed.
+script file will be sourced before any MNV_TEST_SETUP commands are executed.
 
 Every line of a source file must not be longer than 1425 (19 x 75) characters.
 
@@ -83,12 +83,12 @@ available syntax tests for Java:
 command arguments when you press certain keys, e.g. Tab or Ctrl-i.)
 
 As an alternative, you can specify a subset of test filenames for running as
-a regular expression and assign it to a VIM_SYNTAX_TEST_FILTER environment
+a regular expression and assign it to a MNV_SYNTAX_TEST_FILTER environment
 variable; e.g. to run all tests whose base names contain "fold", use any of:
 
-	make test -e 'VIM_SYNTAX_TEST_FILTER = fold.*\..\+'
-	make test VIM_SYNTAX_TEST_FILTER='fold.*\..\+'
-	VIM_SYNTAX_TEST_FILTER='fold.*\..\+' make test
+	make test -e 'MNV_SYNTAX_TEST_FILTER = fold.*\..\+'
+	make test MNV_SYNTAX_TEST_FILTER='fold.*\..\+'
+	MNV_SYNTAX_TEST_FILTER='fold.*\..\+' make test
 
 Consider quoting the variable value to avoid any interpretation by the shell.
 
@@ -121,7 +121,7 @@ is covered by the test.  You can follow these steps:
 
 1. Edit the syntax plugin somewhere in your personal setup.  Use a file
    somewhere to try out the changes.
-2. Go to the directory where you have the Vim code checked out and replace the
+2. Go to the directory where you have the MNV code checked out and replace the
    syntax plugin.  Run the tests: "make test".  Usually the tests will still
    pass, but if you fixed syntax highlighting that was already visible in the
    input file, carefully check that the changes in the screendump are
@@ -134,7 +134,7 @@ is covered by the test.  You can follow these steps:
 2. Edit the input file for your language to add the items you have improved.
    (TODO: how to add another screendump?).
    Run the tests and you should get failures.  (You may opt for faster failure
-   by assigning a small number, e.g. "1", to a VIM_SYNTAX_TEST_WAIT_TIME
+   by assigning a small number, e.g. "1", to a MNV_SYNTAX_TEST_WAIT_TIME
    environment variable and gambling away an "uncertain" possibility of
    success.)  Like with the previous step, carefully check that the new
    screendumps in the "failed" directory are good.  Update the syntax plugin
@@ -142,8 +142,8 @@ is covered by the test.  You can follow these steps:
    effect of the syntax plugin improvements.  Then move the screendumps from
    the "failed" to the "dumps" directory.  Now "make test" should succeed.
 3. Prepare a pull request with the modified files:
-	- syntax plugin:    syntax/{name}.vim
-	- Vim setup file:   syntax/testdir/input/setup/{name}.vim (if any)
+	- syntax plugin:    syntax/{name}.mnv
+	- MNV setup file:   syntax/testdir/input/setup/{name}.mnv (if any)
 	- test input file:  syntax/testdir/input/{name}.{ext}
 	- test dump files:  syntax/testdir/dumps/{name}_*.dump
    Since no input file is ever executed when you run the tests, review and
@@ -159,10 +159,10 @@ Viewing generated screendumps (local)
 -------------------------------------
 
 You may also wish to look at the whole batch of failed screendumps after
-running "make test".  Source the "viewdumps.vim" script for this task:
+running "make test".  Source the "viewdumps.mnv" script for this task:
 
-	[VIMRUNTIME=../..] \
-	../../src/vim --clean -S testdir/viewdumps.vim \
+	[MNVRUNTIME=../..] \
+	../../src/mnv --clean -S testdir/viewdumps.mnv \
 				[testdir/dumps/java_*.dump ...]
 
 By default, all screendumps found in the "failed" directory will be added to
@@ -195,7 +195,7 @@ directory by creating a symlink:
 
 You can now examine the extracted screendumps:
 
-	./src/vim --clean -S runtime/syntax/testdir/viewdumps.vim \
+	./src/mnv --clean -S runtime/syntax/testdir/viewdumps.mnv \
 				/tmp/runtime/syntax/testdir/failed/*.dump
 
 
@@ -203,7 +203,7 @@ Viewing generated screendumps (submitted for a pull request)
 ------------------------------------------------------------
 
 Note: There is also a "git difftool" extension described in
-      src/testdir/commondumps.vim
+      src/testdir/commondumps.mnv
 
 First, you need to check out the topic branch with the proposed changes and
 write down a difference list between the HEAD commit (index) and its parent
@@ -237,7 +237,7 @@ you can now examine the screendumps from the "failed" directory (note that new
 screendumps will be shown with no difference between their versions):
 
 	cd ..
-	../../../src/vim --clean -S viewdumps.vim
+	../../../src/mnv --clean -S viewdumps.mnv
 
 
 TODO: test syncing by jumping around
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_00.dump
index 4b65f164ba..4b65f164ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_01.dump
index 7eb90cc029..7eb90cc029 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_02.dump
index df9b1f78f3..df9b1f78f3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_00.dump
index 39857166da..39857166da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_01.dump
index ff3e810322..ff3e810322 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_02.dump
index 22c31e20fe..22c31e20fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_03.dump
index ed7c835e02..ed7c835e02 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_00.dump
index a2168b590d..a2168b590d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_01.dump
index 360e0e356a..360e0e356a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_02.dump
index b2848bc9a7..b2848bc9a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_03.dump
index f71c49c3d8..f71c49c3d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_04.dump
index 0fd7af7c58..0fd7af7c58 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_05.dump
index 69721afafc..69721afafc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_06.dump
index b9436311ba..b9436311ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_00.dump
index e310e47c52..e310e47c52 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_01.dump
index 9ed03150e5..9ed03150e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_00.dump
index dc43347b0b..dc43347b0b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_01.dump
index 4a2795dbe2..4a2795dbe2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_02.dump
index 34e51d71ac..34e51d71ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_03.dump
index 7eb54fa592..7eb54fa592 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_04.dump
index 3572cb34bf..3572cb34bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_05.dump
index e7d14e588a..e7d14e588a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_constructors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_constructors_00.dump
index 6aa0cba8d8..6aa0cba8d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_constructors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_00.dump
index 6c01f4271b..6c01f4271b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_01.dump
index e16bd69e59..e16bd69e59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_02.dump
index 891384240a..891384240a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_03.dump
index 48f1253284..48f1253284 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_04.dump
index 2c507e1ed0..2c507e1ed0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_05.dump
index abf71b017e..abf71b017e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_06.dump
index 85c8000a8c..85c8000a8c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_07.dump
index 928fc56aa9..928fc56aa9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_08.dump
index 22c33e877c..22c33e877c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_09.dump
index a8db5cd3ee..a8db5cd3ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_10.dump
index 6d359140b5..6d359140b5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_11.dump
index b416e91501..b416e91501 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_12.dump
index d7d8b7ed35..d7d8b7ed35 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_00.dump
index a370779d19..a370779d19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_01.dump
index eb4ae910ee..eb4ae910ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_02.dump
index 31ab784ce1..31ab784ce1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_03.dump
index 97457ba72e..97457ba72e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_04.dump
index a7fcfe7daf..a7fcfe7daf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_00.dump
index 48b1b931bf..48b1b931bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_01.dump
index e407c48cf3..e407c48cf3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_02.dump
index 80de241940..80de241940 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_03.dump
index b91691e3fa..b91691e3fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_04.dump
index 46b383bf96..46b383bf96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_05.dump
index 5de68b2859..5de68b2859 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_06.dump
index f6b5bbda81..f6b5bbda81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_07.dump
index 75399df7fa..75399df7fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_08.dump
index 0f735c5829..0f735c5829 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_09.dump
index 07ed29a00a..07ed29a00a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_10.dump
index 5f63535a65..5f63535a65 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_11.dump
index 8a097c24ea..8a097c24ea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_12.dump
index 0af7a4fd55..0af7a4fd55 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_13.dump
index dba3c326ca..dba3c326ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_14.dump
index d3e36b612f..d3e36b612f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_15.dump
index 0e982b0678..0e982b0678 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_16.dump
index 2aac4046d7..2aac4046d7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_17.dump
index bbcd3683ae..bbcd3683ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_18.dump
index 7f043f5470..7f043f5470 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_19.dump
index 4699962f7a..4699962f7a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_20.dump
index 67fdb5d1e0..67fdb5d1e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_21.dump
index efb41a43e5..efb41a43e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_22.dump
index 630385357c..630385357c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_23.dump
index d53b9d9fae..d53b9d9fae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_24.dump
index 2714e67fca..2714e67fca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_25.dump
index f3c66fec5f..f3c66fec5f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_25.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_26.dump
index e687f3b5d0..e687f3b5d0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_26.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_27.dump
index 404739b8b2..404739b8b2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_27.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_28.dump
index c7352db6e6..c7352db6e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_28.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_29.dump
index de0d9e9298..de0d9e9298 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_29.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_30.dump
index 7bae3e042b..7bae3e042b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_30.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_31.dump
index f1131a4d60..f1131a4d60 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_31.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_32.dump
index a50b6a861d..a50b6a861d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_32.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_33.dump
index c45488123f..c45488123f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_33.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_34.dump
index 784020926f..784020926f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_34.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_35.dump
index 20121203e6..20121203e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_35.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_36.dump
index 805ad1426b..805ad1426b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_36.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_37.dump
index 7e297dabad..7e297dabad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_37.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_38.dump
index 071b0ef5c7..071b0ef5c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_38.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_39.dump
index 355244dd2f..355244dd2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_39.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_40.dump
index 309839a5e1..309839a5e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_40.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_41.dump
index 3cefd9fe95..3cefd9fe95 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_41.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_42.dump
index c4b5ddd8dd..c4b5ddd8dd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_42.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_43.dump
index 84d24d0936..84d24d0936 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_43.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_44.dump
index cc15234cc5..cc15234cc5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_44.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_45.dump
index ac36858445..ac36858445 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_45.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_46.dump
index c7f37a9b71..c7f37a9b71 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_46.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_47.dump
index a83f90b50f..a83f90b50f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_47.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_48.dump
index 158d4d24ba..158d4d24ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_48.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_49.dump
index f94e39210d..f94e39210d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_49.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_50.dump
index 62e5b5c49a..62e5b5c49a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_50.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_51.dump
index c8ce286a56..c8ce286a56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_51.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_52.dump
index f1d21db59c..f1d21db59c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_52.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_53.dump
index 15511c3906..15511c3906 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_53.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_54.dump
index de2558dcde..de2558dcde 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_54.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_55.dump
index b0838eec2f..b0838eec2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_55.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_56.dump
index 133a501589..133a501589 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_56.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_57.dump
index 8441704654..8441704654 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_57.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_58.dump
index 859389dcb0..859389dcb0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_58.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_59.dump
index 4137a55a43..4137a55a43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_59.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_60.dump
index 13cb087a3a..13cb087a3a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_60.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_61.dump
index 31261ce9c9..31261ce9c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_61.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_62.dump
index b145a0c17b..b145a0c17b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_62.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_63.dump
index a2992fadd0..a2992fadd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_63.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_64.dump
index b1eb631ef1..b1eb631ef1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_64.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_65.dump
index 72124d17a0..72124d17a0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_65.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_66.dump
index 5553301525..5553301525 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_66.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_67.dump
index 0f1d5fd5df..0f1d5fd5df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_67.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_00.dump
index c900d829a2..c900d829a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_01.dump
index 15c6e390e3..15c6e390e3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_02.dump
index 9d46396b0d..9d46396b0d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_00.dump
index fa28754896..fa28754896 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_01.dump
index 2b47e5723e..2b47e5723e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_00.dump
index f75f63f997..f75f63f997 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_01.dump
index 44352cfd3f..44352cfd3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_02.dump
index 6f50dcd67a..6f50dcd67a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_03.dump
index 5bcf508c24..5bcf508c24 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_04.dump
index 2aa72a9bdf..2aa72a9bdf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_05.dump
index e4e7836b22..e4e7836b22 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_06.dump
index 38215de42e..38215de42e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_00.dump
index 5842cffa2f..5842cffa2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_01.dump
index 73744dd7b6..73744dd7b6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_02.dump
index b88ba571e8..b88ba571e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_00.dump
index 5d5b08fedb..5d5b08fedb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_01.dump
index 1335c9fa7e..1335c9fa7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_02.dump
index 9b0f7f1860..9b0f7f1860 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_03.dump
index 7b813bc343..7b813bc343 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_04.dump
index 9d4db8f915..9d4db8f915 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_05.dump
index 8e6c2e7d3f..8e6c2e7d3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_00.dump
index b3a368d48d..b3a368d48d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_01.dump
index bfc9103cdb..bfc9103cdb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_02.dump
index b7d3c83310..b7d3c83310 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_00.dump
index f50d4a5055..f50d4a5055 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_01.dump
index 5498379d35..5498379d35 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_02.dump
index daaca61419..daaca61419 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_00.dump
index b54d713038..b54d713038 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_01.dump
index 51f8ba9e57..51f8ba9e57 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_02.dump
index 0fc54ef3ca..0fc54ef3ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_03.dump
index efbc9203d9..efbc9203d9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_04.dump
index d1e55258a6..d1e55258a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_05.dump
index 7d5e19fdae..7d5e19fdae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_06.dump
index 28c5926225..28c5926225 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_00.dump
index 39aa281414..39aa281414 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_01.dump
index 9d89454ada..9d89454ada 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_02.dump
index ea070ef8ac..ea070ef8ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_00.dump
index 6694ed7194..6694ed7194 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_01.dump
index e4881b8ee4..e4881b8ee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_02.dump
index aa40a19db3..aa40a19db3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_03.dump
index 9f70a8ce56..9f70a8ce56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_04.dump
index 71897e5037..71897e5037 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_05.dump
index d1a98e7553..d1a98e7553 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_06.dump
index 0af6e896db..0af6e896db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_07.dump
index 72e34392be..72e34392be 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_08.dump
index 4234423889..4234423889 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_09.dump
index 52af3d8259..52af3d8259 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_10.dump
index c2158724ce..c2158724ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_11.dump
index c29d680cd2..c29d680cd2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_12.dump
index b1bc7cdbfa..b1bc7cdbfa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_13.dump
index b41c983297..b41c983297 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_14.dump
index 6c0659877c..6c0659877c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_15.dump
index 383207f7ea..383207f7ea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_16.dump
index 80f70dd589..80f70dd589 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_00.dump
index ac066ec60b..ac066ec60b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_01.dump
index 4133ae3226..4133ae3226 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_type_00.dump
index c5fa4c94e5..c5fa4c94e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_type_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_00.dump
index 1e66891af3..1e66891af3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_01.dump
index 39067b0bee..39067b0bee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_02.dump
index 442725444e..442725444e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_03.dump
index 8e3d22ff3f..8e3d22ff3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_04.dump
index eeee94f511..eeee94f511 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_05.dump
index 32d0c59b6c..32d0c59b6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_06.dump
index ec18961874..ec18961874 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_07.dump
index 77f871048c..77f871048c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_08.dump
index c1f31fcfc6..c1f31fcfc6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_09.dump
index 277f7ba50d..277f7ba50d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_10.dump
index d83a170c17..d83a170c17 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_11.dump
index fdea0d092c..fdea0d092c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_12.dump
index 6ad0079b85..6ad0079b85 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_00.dump
index 8ca5f8b7f1..8ca5f8b7f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_01.dump
index cb8b0aa108..cb8b0aa108 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_02.dump
index db1e0130cd..db1e0130cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_03.dump
index fae788c085..fae788c085 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_04.dump
index 0fbf9c339c..0fbf9c339c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_05.dump
index bc258f6aee..bc258f6aee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_06.dump
index e26a13a6ae..e26a13a6ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_07.dump
index c61c89a2c4..c61c89a2c4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_08.dump
index 657983f01c..657983f01c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_09.dump
index 9e02888b21..9e02888b21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_10.dump
index 6624a78c2b..6624a78c2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_11.dump
index 53e8445e1f..53e8445e1f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_12.dump
index 522ffddce7..522ffddce7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_13.dump
index f36c967295..f36c967295 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_14.dump
index 8511d6fe38..8511d6fe38 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_15.dump
index dfdacdd959..dfdacdd959 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_16.dump
index 31a186f251..31a186f251 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_17.dump
index 82f79ef536..82f79ef536 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_00.dump
index 165cc4c798..165cc4c798 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_01.dump
index e7f1197014..e7f1197014 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_02.dump
index 4dde18a4f9..4dde18a4f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_00.dump
index 875858659c..875858659c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_01.dump
index fb51a8e22f..fb51a8e22f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_02.dump
index b797ebfd4e..b797ebfd4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_03.dump
index 2fc1beb437..2fc1beb437 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_04.dump
index b8b324cefe..b8b324cefe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_05.dump
index 2269292539..2269292539 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_06.dump
index 508abd90d4..508abd90d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_07.dump
index 881fb09688..881fb09688 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_08.dump
index c243859a68..c243859a68 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_09.dump
index 4e41855706..4e41855706 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_10.dump
index ffda6f920f..ffda6f920f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_11.dump
index 5a6e030712..5a6e030712 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_12.dump
index e4e65e3bf0..e4e65e3bf0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_00.dump
index ef792b5b3a..ef792b5b3a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_01.dump
index d68c0a2ad3..d68c0a2ad3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_02.dump
index c9388ef44b..c9388ef44b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_03.dump
index 84f58af60b..84f58af60b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_04.dump
index f0ef27db55..f0ef27db55 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_05.dump
index 32901e8ee4..32901e8ee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_06.dump
index c613084a97..c613084a97 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_07.dump
index 8ce2d2becd..8ce2d2becd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_08.dump
index 9e436a3740..9e436a3740 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_09.dump
index eadf090b10..eadf090b10 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_10.dump
index b5c825be21..b5c825be21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_00.dump
index 41fc359fd5..41fc359fd5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_01.dump
index 15d655b6a7..15d655b6a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_02.dump
index e0029f6262..e0029f6262 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_03.dump
index e38ebf06bb..e38ebf06bb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_04.dump
index 791efc23c9..791efc23c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_05.dump
index a804b2f192..a804b2f192 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_00.dump
index 3f189294a2..3f189294a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_01.dump
index 4481e4774a..4481e4774a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_02.dump
index d3016acb91..d3016acb91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_03.dump
index 93d206708c..93d206708c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_04.dump
index 63ed50fe01..63ed50fe01 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_05.dump
index 73e0237f4c..73e0237f4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_06.dump
index fc7f19b874..fc7f19b874 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_07.dump
index 831c23bd23..831c23bd23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_08.dump
index 10fad7f49f..10fad7f49f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_09.dump
index 3dbfd3cefa..3dbfd3cefa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_00.dump
index f01edc18fb..f01edc18fb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_01.dump
index 8c1c39c25d..8c1c39c25d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_00.dump
index 89b32ceae0..89b32ceae0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_01.dump
index 55ff243559..55ff243559 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_00.dump
index ee6f101a54..ee6f101a54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_01.dump
index 7ee5d5b85b..7ee5d5b85b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_shebang_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_shebang_00.dump
index c4f6f80902..c4f6f80902 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_shebang_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_shebang_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_00.dump
index 8a7d4edd94..8a7d4edd94 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_01.dump
index aaa99d7464..aaa99d7464 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_02.dump
index 9f998522d9..9f998522d9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_03.dump
index 17439c33d7..17439c33d7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_00.dump
index aada2bbb4f..aada2bbb4f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_01.dump
index f1c2d22300..f1c2d22300 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_00.dump
index ea8eaecb47..ea8eaecb47 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_01.dump
index 1777272462..1777272462 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_02.dump
index feed1359e0..feed1359e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_03.dump
index 934eaa5e06..934eaa5e06 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_04.dump
index 4e9ce2c159..4e9ce2c159 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_05.dump
index af95527c2e..af95527c2e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_00.dump
index 4467a67bbe..4467a67bbe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_01.dump
index 0499393c99..0499393c99 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_00.dump
index 515da0f089..515da0f089 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_00.dump
index a60f904057..a60f904057 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_01.dump
index 21d48d7c59..21d48d7c59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_00.dump
index efd7f06a07..efd7f06a07 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_01.dump
index 7f9cd31527..7f9cd31527 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_00.dump
index fea017b492..fea017b492 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_01.dump
index baaaeabcca..baaaeabcca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_02.dump
index 1c315aee23..1c315aee23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_03.dump
index bb0a3660ba..bb0a3660ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_04.dump
index 09eecdfa63..09eecdfa63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_05.dump
index 53f4fe1dd2..53f4fe1dd2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_06.dump
index 898f64284c..898f64284c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_07.dump
index f0aadcbbd1..f0aadcbbd1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_08.dump
index cb8f53f0d3..cb8f53f0d3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_09.dump
index 9515d52442..9515d52442 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_10.dump
index 10f79433d4..10f79433d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_11.dump
index ebaabb82ef..ebaabb82ef 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_12.dump
index 642e30b2cc..642e30b2cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_13.dump
index 638d2b6082..638d2b6082 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_14.dump
index afe83a8d7b..afe83a8d7b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_15.dump
index a3a34d954b..a3a34d954b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_00.dump
index 7a1f9cbd6b..7a1f9cbd6b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_01.dump
index c44edc9b3e..c44edc9b3e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_00.dump
index 5e6b5a2f0f..5e6b5a2f0f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_01.dump
index 2c52e515da..2c52e515da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_02.dump
index 5156e42793..5156e42793 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_03.dump
index a125c0bb18..a125c0bb18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_04.dump
index 48acc83f63..48acc83f63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_00.dump
index dbcca1edc2..dbcca1edc2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_01.dump
index 335408834f..335408834f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_02.dump
index c13bcbd29d..c13bcbd29d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_03.dump
index c364e75539..c364e75539 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_00.dump
index d5b99a61e3..d5b99a61e3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_01.dump
index f151b1e612..f151b1e612 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_02.dump
index eb953944f2..eb953944f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_03.dump
index bdfe8cb747..bdfe8cb747 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_00.dump
index 1435c62f7e..1435c62f7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_01.dump
index 37bc23dc57..37bc23dc57 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_02.dump
index 1a311c4cf7..1a311c4cf7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_03.dump
index c5f527cc23..c5f527cc23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_04.dump
index 4f7fc37771..4f7fc37771 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_00.dump
index 82090d4caf..82090d4caf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_01.dump
index 4b2480bb84..4b2480bb84 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_02.dump
index 7af6098a79..7af6098a79 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_03.dump
index c669cbb921..c669cbb921 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_04.dump
index 4f18da29ed..4f18da29ed 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_05.dump
index 1823bf05e2..1823bf05e2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_06.dump
index 4c03fefed1..4c03fefed1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_07.dump
index ca3c695175..ca3c695175 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_08.dump
index 59d0a40a9a..59d0a40a9a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_09.dump
index 8efefee3aa..8efefee3aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_10.dump
index b35de96498..b35de96498 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_11.dump
index 6a71d9d049..6a71d9d049 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_12.dump
index 971dc181e6..971dc181e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_13.dump
index 1d2ecbfaf5..1d2ecbfaf5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_14.dump
index 765dccbc56..765dccbc56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_15.dump
index 5cebc2c44d..5cebc2c44d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_behave_00.dump
index 3b90d8c963..3b90d8c963 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_behave_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_00.dump
index 33e0d7d1cd..33e0d7d1cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_01.dump
index 7ee1e128d5..7ee1e128d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_02.dump
index 1faa79ccbe..1faa79ccbe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_03.dump
index 18450b879f..18450b879f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_04.dump
index 3e21309a81..3e21309a81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_05.dump
index 8525bc7b2e..8525bc7b2e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_00.dump
index 13fdb02e2c..13fdb02e2c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_01.dump
index ddae2cca9c..ddae2cca9c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_02.dump
index 67f8905f21..67f8905f21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_03.dump
index 6669a0a7ac..6669a0a7ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_catch_00.dump
index de76e72a25..de76e72a25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_catch_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_00.dump
index fa388fef1d..fa388fef1d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_01.dump
index 388e9d5e96..388e9d5e96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_02.dump
index f2fefb1ae1..f2fefb1ae1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_03.dump
index 1be9f06e2b..1be9f06e2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_04.dump
index ce3e8bd6c2..ce3e8bd6c2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_05.dump
index b7b7bfb5d5..b7b7bfb5d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_06.dump
index f2ad382494..f2ad382494 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_00.dump
index 8ddf51eff5..8ddf51eff5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_01.dump
index 78492c7f3d..78492c7f3d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_02.dump
index dd95498f4e..dd95498f4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_03.dump
index aa0e2f0c32..aa0e2f0c32 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_04.dump
index c819f228cd..c819f228cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_05.dump
index d5cccc3289..d5cccc3289 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_06.dump
index ce8e796578..ce8e796578 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_07.dump
index e88760eaa3..e88760eaa3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_08.dump
index 63a768760d..63a768760d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_09.dump
index bc89f17530..bc89f17530 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_10.dump
index 5cc86bdcf2..5cc86bdcf2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_11.dump
index 1e50b3f141..1e50b3f141 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_00.dump
index a6984d4c22..a6984d4c22 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_01.dump
index 3c2fac5720..3c2fac5720 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_02.dump
index 05b0489521..05b0489521 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_03.dump
index 6af289dec4..6af289dec4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_04.dump
index 53ac039c2d..53ac039c2d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_05.dump
index 2f09531969..2f09531969 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_06.dump
index 9b089ae2b0..9b089ae2b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_07.dump
index be01800d8b..be01800d8b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_00.dump
index f76ed95f83..f76ed95f83 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_01.dump
index 71de8142a6..71de8142a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_02.dump
index 98b142a75b..98b142a75b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_03.dump
index fcedbfe3cc..fcedbfe3cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_04.dump
index 2a4372e58f..2a4372e58f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_05.dump
index 8c9b77acd6..8c9b77acd6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_06.dump
index 368df373f9..368df373f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_07.dump
index 7507a133fa..7507a133fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_08.dump
index 970062ec9d..970062ec9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_09.dump
index 6a8def6869..6a8def6869 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_10.dump
index 2a6deef87f..2a6deef87f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_11.dump
index a309127dcd..a309127dcd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_12.dump
index 06203eb3fd..06203eb3fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_13.dump
index a9e23fb2e8..a9e23fb2e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_14.dump
index 26142ba640..26142ba640 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_15.dump
index 08cf8f7891..08cf8f7891 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_16.dump
index a9a77266b7..a9a77266b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_17.dump
index 9f0186aaf6..9f0186aaf6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_18.dump
index ff65ca356b..ff65ca356b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_19.dump
index 2b91ce8c27..2b91ce8c27 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_20.dump
index bf02f0157a..bf02f0157a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_21.dump
index 2ee8d6fbdc..2ee8d6fbdc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_22.dump
index 376f35a219..376f35a219 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_23.dump
index 9c180652fd..9c180652fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_24.dump
index 1e45efe3c4..1e45efe3c4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_25.dump
index 2c63093785..2c63093785 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_25.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_26.dump
index 147c58c75c..147c58c75c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_26.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_27.dump
index db85b31e87..db85b31e87 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_27.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_28.dump
index 5d1200e6cb..5d1200e6cb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_28.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_29.dump
index 1b9117b388..1b9117b388 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_29.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_30.dump
index 5bcbeef9af..5bcbeef9af 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_30.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_31.dump
index 5abc5ab7f4..5abc5ab7f4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_31.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_32.dump
index 8ec5f2f9a5..8ec5f2f9a5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_32.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_33.dump
index cc321b4ecb..cc321b4ecb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_33.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_34.dump
index bb2242efa2..bb2242efa2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_34.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_35.dump
index 64447816b8..64447816b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_35.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_36.dump
index 031dcb1588..031dcb1588 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_36.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_37.dump
index 739767ea0c..739767ea0c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_37.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_38.dump
index 0ee37ba1da..0ee37ba1da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_38.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_39.dump
index 71e0796dce..71e0796dce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_39.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_40.dump
index 1a5394dd17..1a5394dd17 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_40.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_41.dump
index 9586e55504..9586e55504 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_41.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_42.dump
index 058fc102b7..058fc102b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_42.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_43.dump
index 736510c9ae..736510c9ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_43.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_44.dump
index 9e5160d460..9e5160d460 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_44.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_45.dump
index 135407e8ce..135407e8ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_45.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_46.dump
index 2dc666444f..2dc666444f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_46.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_47.dump
index b5426c5b45..b5426c5b45 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_47.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_48.dump
index 6c3ee2f4de..6c3ee2f4de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_48.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_49.dump
index 5e7527e119..5e7527e119 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_49.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_50.dump
index 13d729c01d..13d729c01d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_50.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_51.dump
index 643459ba1e..643459ba1e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_51.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_52.dump
index 64f99821cd..64f99821cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_52.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_53.dump
index 5e3d63d7f9..5e3d63d7f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_53.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_54.dump
index da5b8ab7a1..da5b8ab7a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_54.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_55.dump
index 736a9c5094..736a9c5094 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_55.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_56.dump
index 86f8660aba..86f8660aba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_56.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_57.dump
index 71b504ea1b..71b504ea1b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_57.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_58.dump
index 6753a5100a..6753a5100a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_58.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_59.dump
index 57073b2e25..57073b2e25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_59.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_60.dump
index b230033778..b230033778 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_60.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_61.dump
index ffc8eab758..ffc8eab758 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_61.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_62.dump
index 54d4e484e9..54d4e484e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_62.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_63.dump
index 5d3070de16..5d3070de16 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_63.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_64.dump
index 64c9f4dc3d..64c9f4dc3d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_64.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_65.dump
index 51b2aa18f2..51b2aa18f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_65.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_66.dump
index ab374c22c7..ab374c22c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_66.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_67.dump
index 7677b76cb1..7677b76cb1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_67.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debug_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debug_00.dump
index 5ee2c340d6..5ee2c340d6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debug_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debug_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_00.dump
index 17af170e19..17af170e19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_01.dump
index a850ee8b68..a850ee8b68 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_02.dump
index 357f8bb297..357f8bb297 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_00.dump
index 2f87f33053..2f87f33053 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_01.dump
index f13f4f4e3c..f13f4f4e3c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_02.dump
index 14cffbda09..14cffbda09 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_03.dump
index 4ab6ef5e9b..4ab6ef5e9b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_04.dump
index 6b5e93d8dc..6b5e93d8dc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_05.dump
index 6519226746..6519226746 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_06.dump
index 3c4b3ab06c..3c4b3ab06c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_07.dump
index 87f3964bd0..87f3964bd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_00.dump
index cbf57d74a4..cbf57d74a4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_01.dump
index 50073ed433..50073ed433 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_02.dump
index 435894cbad..435894cbad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_03.dump
index 39f91a710f..39f91a710f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_04.dump
index 00d7f43b6c..00d7f43b6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_05.dump
index 6177af78e2..6177af78e2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_06.dump
index f2045053d1..f2045053d1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_07.dump
index 698735cb4f..698735cb4f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_08.dump
index 29ce8a25b4..29ce8a25b4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_09.dump
index df82f27683..df82f27683 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_10.dump
index 0b67be09e9..0b67be09e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_00.dump
index 9fe6696f43..9fe6696f43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_01.dump
index 0fc35aaf48..0fc35aaf48 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_fold_00.dump
index 26c48152e8..26c48152e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_00.dump
index 04e16a4a54..04e16a4a54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_01.dump
index ed7fd6c579..ed7fd6c579 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_02.dump
index dc6ab66845..dc6ab66845 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_03.dump
index a4e71137c5..a4e71137c5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_defer_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_defer_00.dump
index d5a5f5f26a..d5a5f5f26a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_defer_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_defer_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_00.dump
index 8eb82e74fd..8eb82e74fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_01.dump
index 27d466b167..27d466b167 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_02.dump
index 64f7d3026d..64f7d3026d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_00.dump
index 3b5518cb9e..3b5518cb9e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_01.dump
index ccbca1b82a..ccbca1b82a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_02.dump
index cbdabcd357..cbdabcd357 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_03.dump
index 8454ec94dc..8454ec94dc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_00.dump
index 077f03dcbf..077f03dcbf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_01.dump
index f23db5d580..f23db5d580 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_02.dump
index 54b1cfe704..54b1cfe704 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_03.dump
index 239a31dfa9..239a31dfa9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_00.dump
index ba9907670a..ba9907670a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_01.dump
index 292a190b9a..292a190b9a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_00.dump
index e5c53af920..e5c53af920 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_01.dump
index 685addd961..685addd961 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_02.dump
index f5f892e62b..f5f892e62b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_03.dump
index 7f52581b96..7f52581b96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_00.dump
index 69b29f8fd0..69b29f8fd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_01.dump
index 1a42053b2b..1a42053b2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filter_00.dump
index 0aaf0eb6a0..0aaf0eb6a0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filter_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_00.dump
index c13fecae06..c13fecae06 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_01.dump
index 3ee064ab77..3ee064ab77 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_02.dump
index b67143fc53..b67143fc53 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_03.dump
index 3851717258..3851717258 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_00.dump
index e6f67d5b30..e6f67d5b30 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_01.dump
index c009a805c3..c009a805c3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_02.dump
index ebe59a877d..ebe59a877d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_03.dump
index 09c3a5491f..09c3a5491f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_04.dump
index 9e49064bec..9e49064bec 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_05.dump
index 2b726b372e..2b726b372e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_06.dump
index 6eaeddd8ab..6eaeddd8ab 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_07.dump
index 5b68b92026..5b68b92026 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_08.dump
index e49c5ffb9d..e49c5ffb9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_09.dump
index 19f42e1260..19f42e1260 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_10.dump
index 3a384803f2..3a384803f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_11.dump
index 6ada5e7309..6ada5e7309 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_12.dump
index 7b3b789ae3..7b3b789ae3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_13.dump
index 69be8a98f1..69be8a98f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_14.dump
index 03e3550056..03e3550056 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_15.dump
index df284e0278..df284e0278 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_00.dump
index 82bdf388dd..82bdf388dd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_01.dump
index c76fa06e43..c76fa06e43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_02.dump
index 025986f526..025986f526 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_00.dump
index 111094edcd..111094edcd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_01.dump
index 0049aeddc3..0049aeddc3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_02.dump
index ae919ba17b..ae919ba17b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_00.dump
index 4fa7e437ae..4fa7e437ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_01.dump
index 78eef92c4c..78eef92c4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_02.dump
index 7bb08c7666..7bb08c7666 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_03.dump
index b41ea7eb83..b41ea7eb83 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_04.dump
index f6a6ff34ee..f6a6ff34ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_05.dump
index b3555a3c43..b3555a3c43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_06.dump
index 4ad53bda38..4ad53bda38 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_07.dump
index 3a6a96e9a2..3a6a96e9a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_08.dump
index 0ee8bbcfe7..0ee8bbcfe7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_09.dump
index 12e9f33542..12e9f33542 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_10.dump
index 065c637055..065c637055 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_11.dump
index dc37818741..dc37818741 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_12.dump
index b118773bb5..b118773bb5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_13.dump
index a73c91e526..a73c91e526 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_14.dump
index c1e406164b..c1e406164b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_15.dump
index 48a877e159..48a877e159 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_16.dump
index e3d9bbd956..e3d9bbd956 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_17.dump
index db3157e51b..db3157e51b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_18.dump
index dfdba9126a..dfdba9126a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_19.dump
index 6d5f7a8a37..6d5f7a8a37 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_00.dump
index dd0f87a923..dd0f87a923 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_01.dump
index 1f035effe5..1f035effe5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_02.dump
index 6061a76568..6061a76568 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_fold_00.dump
index 85ca3ef50b..85ca3ef50b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_00.dump
index 702882a714..702882a714 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_01.dump
index fd6df33d5a..fd6df33d5a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_02.dump
index 0dd1030c50..0dd1030c50 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_00.dump
index c740147518..c740147518 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_01.dump
index 82350a74de..82350a74de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_02.dump
index 392120ace3..392120ace3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_03.dump
index 1cce14f6e0..1cce14f6e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_helpgrep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_helpgrep_00.dump
index 1e4b383439..1e4b383439 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_helpgrep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_helpgrep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_00.dump
index 8e32efb164..8e32efb164 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_01.dump
index 0e3ab04015..0e3ab04015 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_02.dump
index f91917d432..f91917d432 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_03.dump
index f5da0db9b0..f5da0db9b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_04.dump
index 72ff60d6c9..72ff60d6c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_05.dump
index 50c41e16bf..50c41e16bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_06.dump
index 5f6791da02..5f6791da02 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_00.dump
index 7a1eb3eb2a..7a1eb3eb2a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_01.dump
index 71c8a8cd23..71c8a8cd23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_02.dump
index 56d12fe989..56d12fe989 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_03.dump
index 828d95ad19..828d95ad19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_04.dump
index 07fab77be4..07fab77be4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_05.dump
index 57b9480181..57b9480181 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_00.dump
index 8d1e40f005..8d1e40f005 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_01.dump
index 62070f9740..62070f9740 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_02.dump
index 9fb21c2f41..9fb21c2f41 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_03.dump
index 686b8bdf11..686b8bdf11 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_04.dump
index 957e4d9988..957e4d9988 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_05.dump
index 151b5eb3e1..151b5eb3e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_06.dump
index 7716921dd0..7716921dd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_00.dump
index 9209db3283..9209db3283 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_01.dump
index 9b9054d2c1..9b9054d2c1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_02.dump
index 704b3e6cea..704b3e6cea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_03.dump
index d291e9b7a1..d291e9b7a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_04.dump
index f32a38a764..f32a38a764 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_05.dump
index 938098877a..938098877a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_06.dump
index 9a55c3b69f..9a55c3b69f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_07.dump
index a807f486a2..a807f486a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_08.dump
index 285d4f2855..285d4f2855 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_09.dump
index 29fcdc64b8..29fcdc64b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_00.dump
index bce7662396..bce7662396 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_01.dump
index 0ac68d2e28..0ac68d2e28 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_02.dump
index 16ccba8cc7..16ccba8cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_03.dump
index 705cafca75..705cafca75 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_04.dump
index 5b8263a2c7..5b8263a2c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_05.dump
index ae0c3159f1..ae0c3159f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_06.dump
index cca169c05a..cca169c05a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_07.dump
index bfa037dedd..bfa037dedd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_08.dump
index 661c39eb69..661c39eb69 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_09.dump
index 611d6aa737..611d6aa737 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_10.dump
index bdd6e5c37a..bdd6e5c37a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_11.dump
index e8904f3266..e8904f3266 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_12.dump
index a65d1ff236..a65d1ff236 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_13.dump
index b69d31d850..b69d31d850 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_14.dump
index 9e1273f37e..9e1273f37e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_00.dump
index ab573500b7..ab573500b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_01.dump
index fb5cde1e8d..fb5cde1e8d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_bar_00.dump
index 4ecde124bb..4ecde124bb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_bar_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_colon_00.dump
index d7911d86b5..d7911d86b5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_colon_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_00.dump
index d2f0702e0f..d2f0702e0f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_01.dump
index 6e9e4e85a3..6e9e4e85a3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_02.dump
index 93e67aa4e5..93e67aa4e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_00.dump
index f7bc47c7c8..f7bc47c7c8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_01.dump
index 570358cbba..570358cbba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_02.dump
index f8328fe83d..f8328fe83d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_00.dump
index 80b2d5353a..80b2d5353a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_01.dump
index b7b32c1863..b7b32c1863 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_02.dump
index 07257b6db3..07257b6db3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_03.dump
index 86d4d0ae59..86d4d0ae59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_04.dump
index c742d09742..c742d09742 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_05.dump
index c3765cea2a..c3765cea2a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_06.dump
index 4e5b057440..4e5b057440 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_07.dump
index c8476d82db..c8476d82db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_00.dump
index b328f5a410..b328f5a410 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_01.dump
index e940ee803f..e940ee803f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_02.dump
index bd0e393c9d..bd0e393c9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_03.dump
index 19e555f998..19e555f998 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_04.dump
index bc2c2f675f..bc2c2f675f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_05.dump
index d2b889b8b8..d2b889b8b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_06.dump
index 224afb2d1b..224afb2d1b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_07.dump
index a2f23ea0f7..a2f23ea0f7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_08.dump
index 27f607a6c9..27f607a6c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_09.dump
index 46eaca326b..46eaca326b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_10.dump
index 32cc2249af..32cc2249af 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_11.dump
index c986357c09..c986357c09 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_12.dump
index 02064018ce..02064018ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_00.dump
index c36c8b08a7..c36c8b08a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_01.dump
index 01c51e0221..01c51e0221 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_02.dump
index 1a8e7b65a3..1a8e7b65a3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_03.dump
index 002bbf6406..002bbf6406 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_00.dump
index 2c2d4c3dc1..2c2d4c3dc1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_01.dump
index bc17da919a..bc17da919a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_02.dump
index 83bb8c17e0..83bb8c17e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_03.dump
index 84dd1599cd..84dd1599cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_04.dump
index 9c99fb70a2..9c99fb70a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_05.dump
index d86687905b..d86687905b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_00.dump
index 448d554af8..448d554af8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_01.dump
index 35fd08b57d..35fd08b57d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_02.dump
index d163d17cee..d163d17cee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_03.dump
index 17d7482d6c..17d7482d6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_00.dump
index b7862da29b..b7862da29b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_01.dump
index 869a3b11df..869a3b11df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_02.dump
index fefec2425b..fefec2425b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_03.dump
index f77f5c4e5a..f77f5c4e5a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_04.dump
index df3f54fc03..df3f54fc03 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_00.dump
index 736e6d8843..736e6d8843 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_02.dump
index ee29fa2885..ee29fa2885 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_03.dump
index 403b9d355b..403b9d355b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_00.dump
index 83ca511826..83ca511826 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_01.dump
index 73a5480724..73a5480724 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_00.dump
index 4af9df1ea3..4af9df1ea3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_03.dump
index 7624326514..7624326514 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_04.dump
index ce18b19807..ce18b19807 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_00.dump
index 4ff1540da1..4ff1540da1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_01.dump
index 5c206a31a9..5c206a31a9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_02.dump
index dd038ced85..dd038ced85 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_00.dump
index fb755ba282..fb755ba282 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_01.dump
index dcf8400c29..dcf8400c29 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_02.dump
index 688010a8e9..688010a8e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_00.dump
index 181e58fa97..181e58fa97 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_01.dump
index 0c1907885c..0c1907885c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_02.dump
index d0df28fe25..d0df28fe25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_03.dump
index 6efefdaada..6efefdaada 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_04.dump
index e110c12368..e110c12368 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_05.dump
index d8a7ca0723..d8a7ca0723 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_06.dump
index 4eb24b96b1..4eb24b96b1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_07.dump
index 43d833f2d3..43d833f2d3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_08.dump
index e181dd6eec..e181dd6eec 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_09.dump
index 4382132ac3..4382132ac3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_00.dump
index ecc0c73c62..ecc0c73c62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_01.dump
index 76085289fe..76085289fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_02.dump
index acfcf5431d..acfcf5431d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_03.dump
index 89477a99e4..89477a99e4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_04.dump
index d9869fe34b..d9869fe34b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_05.dump
index cadd7bbaa8..cadd7bbaa8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_00.dump
index eae6fb50a6..eae6fb50a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_01.dump
index 64189fa903..64189fa903 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_02.dump
index 225197ea2f..225197ea2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_03.dump
index 8e5d933924..8e5d933924 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_04.dump
index 0a4027adc9..0a4027adc9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_00.dump
index 14dc87e54a..14dc87e54a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_07.dump
index 2e87ddb22a..2e87ddb22a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_00.dump
index 34ffa47212..34ffa47212 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_01.dump
index f927cda64c..f927cda64c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_02.dump
index f6e93228df..f6e93228df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_03.dump
index 3c3f6b6928..3c3f6b6928 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_04.dump
index 3d9fcd20b0..3d9fcd20b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_05.dump
index d544528364..d544528364 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_06.dump
index 5d944c371a..5d944c371a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_07.dump
index c8402b5433..c8402b5433 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_00.dump
index 9b7370db86..9b7370db86 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_01.dump
index c99a3a6f4e..c99a3a6f4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_02.dump
index 4250195d6c..4250195d6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_03.dump
index f0f1662db0..f0f1662db0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_04.dump
index 04e6eadc5d..04e6eadc5d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sleep_00.dump
index 0e99c5a7cd..0e99c5a7cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sleep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_00.dump
index e44a78c109..e44a78c109 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_01.dump
index a8b105d474..a8b105d474 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_02.dump
index ce5dc8dea8..ce5dc8dea8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_03.dump
index a5f9960652..a5f9960652 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_00.dump
index 08ab0b29e8..08ab0b29e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_01.dump
index 763a0f889e..763a0f889e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_02.dump
index 716f4af1de..716f4af1de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_03.dump
index 036a279ff5..036a279ff5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_04.dump
index b4ea513b89..b4ea513b89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_05.dump
index 3b6bc92f58..3b6bc92f58 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_06.dump
index 00569af72b..00569af72b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_07.dump
index 13956ce91b..13956ce91b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_08.dump
index bd1b5d0b18..bd1b5d0b18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_09.dump
index bbe6bb3b25..bbe6bb3b25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_10.dump
index c04abd2691..c04abd2691 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_11.dump
index 7c6405238e..7c6405238e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_00.dump
index c350e5fb9b..c350e5fb9b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_01.dump
index f55f9875aa..f55f9875aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_02.dump
index 2253a0258b..2253a0258b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_03.dump
index cef4588620..cef4588620 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_04.dump
index 0825ee3356..0825ee3356 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_05.dump
index 57afb7816a..57afb7816a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_06.dump
index 67ba95814c..67ba95814c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_07.dump
index 696f88cb07..696f88cb07 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_08.dump
index 156ff01e59..156ff01e59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_09.dump
index a7ed5c811e..a7ed5c811e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_10.dump
index 7031132d74..7031132d74 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_11.dump
index c14f06636a..c14f06636a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_12.dump
index 28a905a8f8..28a905a8f8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_13.dump
index e828336806..e828336806 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_14.dump
index f648fee758..f648fee758 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_15.dump
index 6945ec2c62..6945ec2c62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_16.dump
index 3d1a002d69..3d1a002d69 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_17.dump
index c923c00d45..c923c00d45 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_18.dump
index 605dc0cba1..605dc0cba1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_19.dump
index 3dbd5826bf..3dbd5826bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_20.dump
index e05dc99127..e05dc99127 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_21.dump
index e0746ea9d6..e0746ea9d6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_00.dump
index cb145648f8..cb145648f8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_01.dump
index 732b2e7673..732b2e7673 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_02.dump
index 3badec4e5b..3badec4e5b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_00.dump
index 958ae82dff..958ae82dff 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_08.dump
index 3a29c20b0b..3a29c20b0b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_00.dump
index 52ce080878..52ce080878 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_01.dump
index 2058a78942..2058a78942 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_02.dump
index 1ed13e510d..1ed13e510d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_03.dump
index 4701fa3d7a..4701fa3d7a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_04.dump
index 0609af5aa7..0609af5aa7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_throw_00.dump
index a596aed7c9..a596aed7c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_throw_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_00.dump
index 146ff038ca..146ff038ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_01.dump
index 5489eaa152..5489eaa152 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_00.dump
index f2e33d0d08..f2e33d0d08 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_01.dump
index e5daa83466..e5daa83466 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_02.dump
index fe6b8552e1..fe6b8552e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_03.dump
index af7faa3e64..af7faa3e64 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_00.dump
index 91fa0f54f6..91fa0f54f6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_01.dump
index b111646c71..b111646c71 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_02.dump
index 89d199ad81..89d199ad81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_03.dump
index e625a05fca..e625a05fca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_04.dump
index 728e47ca6d..728e47ca6d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_05.dump
index a57b1c8103..a57b1c8103 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_06.dump
index 81e340dea2..81e340dea2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_07.dump
index 428a2ede18..428a2ede18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_08.dump
index 95dd9099ad..95dd9099ad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_09.dump
index 2063012d61..2063012d61 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_10.dump
index a17403edce..a17403edce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_11.dump
index 38e9322184..38e9322184 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_12.dump
index cb1099b7e9..cb1099b7e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_13.dump
index 1cd89fdf89..1cd89fdf89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_14.dump
index 59727033bc..59727033bc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_15.dump
index ffafa54201..ffafa54201 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_16.dump
index 398b2b8ca3..398b2b8ca3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_17.dump
index 65b6b11223..65b6b11223 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_18.dump
index dd8c961389..dd8c961389 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_19.dump
index 05e9989d95..05e9989d95 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_20.dump
index 1a9b6a6a00..1a9b6a6a00 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_21.dump
index e49a5b752c..e49a5b752c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_22.dump
index 0e5d818fac..0e5d818fac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_23.dump
index 19fb9a4238..19fb9a4238 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_24.dump
index 6231d525cc..6231d525cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_00.dump
index 68d1ec63a1..68d1ec63a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_01.dump
index 05ba8237b0..05ba8237b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_02.dump
index 9de7ceebbf..9de7ceebbf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_03.dump
index 20e4ecffa7..20e4ecffa7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_04.dump
index 0b24a8ebdf..0b24a8ebdf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_05.dump
index ae5ffb84d4..ae5ffb84d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_06.dump
index 40b1322990..40b1322990 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_07.dump
index 8e4c2494bf..8e4c2494bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_08.dump
index 882b3258df..882b3258df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_09.dump
index 207e4efcc1..207e4efcc1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_10.dump
index c385765365..c385765365 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_11.dump
index 09576638a1..09576638a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_12.dump
index e4a47d3831..e4a47d3831 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_13.dump
index 6ad6d7d0a9..6ad6d7d0a9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_14.dump
index b5d23c07fe..b5d23c07fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_15.dump
index 50bf79772f..50bf79772f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_00.dump
index fc69801f61..fc69801f61 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_01.dump
index fd296bc039..fd296bc039 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_02.dump
index a06d1aa3b9..a06d1aa3b9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_03.dump
index 3dcc8e7170..3dcc8e7170 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_04.dump
index d33a29da62..d33a29da62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_05.dump
index 88e95928d5..88e95928d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_06.dump
index cde39acfb7..cde39acfb7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_07.dump
index b114753a03..b114753a03 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_08.dump
index 5c74c14aa2..5c74c14aa2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_09.dump
index 2d3d20fe19..2d3d20fe19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_10.dump
index 338836f681..338836f681 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_11.dump
index 6e2e0519aa..6e2e0519aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_12.dump
index 0e972533da..0e972533da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_13.dump
index cf9f6cc8ed..cf9f6cc8ed 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_14.dump
index c4d5265aaa..c4d5265aaa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_15.dump
index 663c073c1d..663c073c1d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_16.dump
index 816d15ccb0..816d15ccb0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_17.dump
index 139a557165..139a557165 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_18.dump
index 05464652d5..05464652d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_19.dump
index b6c1b12216..b6c1b12216 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_20.dump
index 05682bce4c..05682bce4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_21.dump
index 3cbed5db1f..3cbed5db1f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_22.dump
index ae22145f14..ae22145f14 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_23.dump
index 160b7b5ede..160b7b5ede 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_00.dump
index a6cd90a18e..a6cd90a18e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_01.dump
index 46c4c926f2..46c4c926f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_02.dump
index 87a6258d89..87a6258d89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_03.dump
index 484a0c3e5d..484a0c3e5d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_04.dump
index f852d6fee4..f852d6fee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_05.dump
index 4a85d5e010..4a85d5e010 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_06.dump
index 008f04fd36..008f04fd36 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_07.dump
index 8bec3fe58e..8bec3fe58e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_08.dump
index 70a7ff8408..70a7ff8408 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_09.dump
index 156de87e1c..156de87e1c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_00.dump
index 5d365c3f3f..5d365c3f3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_01.dump
index 4de33e5fdd..4de33e5fdd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_02.dump
index f930e1dfe4..f930e1dfe4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_03.dump
index 297288d21b..297288d21b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_04.dump
index 38b3ad0205..38b3ad0205 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_05.dump
index b588e334f3..b588e334f3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_06.dump
index 5e9b19e770..5e9b19e770 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_07.dump
index a8f4162b54..a8f4162b54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_00.dump
index b9fd0ad5fe..b9fd0ad5fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_01.dump
index 11577d8de2..11577d8de2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_02.dump
index 23b5388a9e..23b5388a9e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_03.dump
index 9ff096f479..9ff096f479 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_new_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_new_00.dump
index 511a5f9552..511a5f9552 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_new_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_new_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_new_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_new_01.dump
index 06651c4734..06651c4734 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_new_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_new_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_00.dump
index eb0e402765..eb0e402765 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_01.dump
index 834941044b..834941044b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_02.dump
index fe5afce6fd..fe5afce6fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_03.dump
index 3b3a4fc657..3b3a4fc657 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_04.dump
index 372d91cb72..372d91cb72 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_05.dump
index bdb3d147c0..bdb3d147c0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_06.dump
index 713a60e1db..713a60e1db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_07.dump
index 38ba63c4b1..38ba63c4b1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_08.dump
index f453d1f93a..f453d1f93a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_09.dump
index 2e170fe20a..2e170fe20a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_10.dump
index 84d342c51d..84d342c51d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_11.dump
index 22bc66747a..22bc66747a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_12.dump
index d5033fb36e..d5033fb36e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_00.dump
index acb0a2e698..acb0a2e698 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_01.dump
index 6b22d4113b..6b22d4113b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_00.dump
index 8d0e81c230..8d0e81c230 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_01.dump
index 39475638f0..39475638f0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_shebang_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_shebang_00.dump
index ffb7bafa08..ffb7bafa08 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_shebang_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_shebang_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_00.dump
index b06b1497c0..b06b1497c0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_01.dump
index 2d0f659031..2d0f659031 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_02.dump
index fac2cbf866..fac2cbf866 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_03.dump
index cf025188cd..cf025188cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_04.dump
index b633655bac..b633655bac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_05.dump
index 0a11e8d22a..0a11e8d22a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_06.dump
index 031115c191..031115c191 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_07.dump
index a8219d9829..a8219d9829 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_08.dump
index 5ca7f0d364..5ca7f0d364 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_09.dump
index 737a044c63..737a044c63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_10.dump
index d7a7d46d4b..d7a7d46d4b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_11.dump
index 042f712354..042f712354 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_12.dump
index d2acc484d5..d2acc484d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_13.dump
index 11593c5d7e..11593c5d7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_14.dump
index e85091b1d8..e85091b1d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_15.dump
index 567fd59df5..567fd59df5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_16.dump
index 5a4618c68b..5a4618c68b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_17.dump
index 2a49205a91..2a49205a91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_18.dump
index 4e6913502a..4e6913502a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_19.dump
index 5510ea6406..5510ea6406 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_20.dump
index 2b1c0c7e30..2b1c0c7e30 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_21.dump
index a721556daf..a721556daf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_22.dump
index 48956348b3..48956348b3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_23.dump
index a8897b5ad8..a8897b5ad8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_23.dump
diff --git a/uvim/runtime/syntax/testdir/ftplugin/java.vim b/uvim/runtime/syntax/testdir/ftplugin/java.mnv
index da198e18e7..da198e18e7 100644
--- a/uvim/runtime/syntax/testdir/ftplugin/java.vim
+++ b/uvim/runtime/syntax/testdir/ftplugin/java.mnv
diff --git a/uvim/runtime/syntax/testdir/input/c.c b/uvim/runtime/syntax/testdir/input/c.c
index 595721b0a5..52336cd034 100644
--- a/uvim/runtime/syntax/testdir/input/c.c
+++ b/uvim/runtime/syntax/testdir/input/c.c
@@ -1,15 +1,15 @@
 /* vi:set ts=8 sts=4 sw=4 noet:
- * VIM_TEST_SETUP let g:c_comment_strings = 1
+ * MNV_TEST_SETUP let g:c_comment_strings = 1
  *
- * VIM - Vi IMproved	by Bram Moolenaar
+ * MNV - MNV is not Vim	by Bram Moolenaar
  *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
+ * Do ":help uganda"  in MNV to read copying and usage conditions.
+ * Do ":help credits" in MNV to see a list of people who contributed.
+ * See README.txt for an overview of the MNV source code.
  */
 
 #define EXTERN
-#include "vim.h"
+#include "mnv.h"
 
 #ifdef __CYGWIN__
 # include <cygwin/version.h>
@@ -18,7 +18,7 @@
 # include <limits.h>
 #endif
 
-#if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(VIMDLL))
+#if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(MNVDLL))
 # include "iscygpty.h"
 #endif
 
@@ -29,12 +29,12 @@
 #define EDIT_TAG    3	    // tag name argument given, use tagname
 #define EDIT_QF	    4	    // start in quickfix mode
 
-#if (defined(UNIX) || defined(VMS)) && !defined(NO_VIM_MAIN)
+#if (defined(UNIX) || defined(VMS)) && !defined(NO_MNV_MAIN)
 static int file_owned(char *fname);
 #endif
 static void mainerr(int, char_u *);
 static void early_arg_scan(mparm_T *parmp);
-#ifndef NO_VIM_MAIN
+#ifndef NO_MNV_MAIN
 static void usage(void);
 static void parse_command_name(mparm_T *parmp);
 static void command_line_scan(mparm_T *parmp);
@@ -81,18 +81,18 @@ static mparm_T	params;
 static void *s_vbuf = NULL;		// buffer for setvbuf()
 #endif
 
-#ifndef NO_VIM_MAIN	// skip this for unittests
+#ifndef NO_MNV_MAIN	// skip this for unittests
 
 static char_u *start_dir = NULL;	// current working dir on startup
 
 static int has_dash_c_arg = FALSE;
 
-# ifdef VIMDLL
+# ifdef MNVDLL
 __declspec(dllexport)
 # endif
     int
 # ifdef MSWIN
-VimMain
+MNVMain
 # else
 main
 # endif
@@ -118,6 +118,6 @@ main
      */
     return mzscheme_main();
 #else
-    return vim_main2();
+    return mnv_main2();
 #endif
 }
diff --git a/uvim/runtime/syntax/testdir/input/codeowners.txt b/uvim/runtime/syntax/testdir/input/codeowners.txt
index e72a77035f..c2fb96cb2d 100644
--- a/uvim/runtime/syntax/testdir/input/codeowners.txt
+++ b/uvim/runtime/syntax/testdir/input/codeowners.txt
@@ -9,4 +9,4 @@
 docs/*	docs@example.com @other
 **/logs @octocat
 
-# vim: set ft=codeowners:
+# mnv: set ft=codeowners:
diff --git a/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp b/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
index 9c50dea2ec..b4457e055e 100644
--- a/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
+++ b/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
@@ -1,6 +1,6 @@
 // C++ attributes - noreturn (since C++11)
 
-// Source: https://en.cppreference.com/w/c/language/noreturn.html [modified by Vim Project]
+// Source: https://en.cppreference.com/w/c/language/noreturn.html [modified by MNV Project]
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/uvim/runtime/syntax/testdir/input/csh.csh b/uvim/runtime/syntax/testdir/input/csh.csh
index 332b626e52..1dfc1fd296 100644
--- a/uvim/runtime/syntax/testdir/input/csh.csh
+++ b/uvim/runtime/syntax/testdir/input/csh.csh
@@ -1,4 +1,4 @@
-# https://github.com/vim/vim/pull/19172#issuecomment-3751574224
+# https://github.com/Project-Tick/Project-Tick/pull/19172#issuecomment-3751574224
 
 set script_dir="" #comment
 set script_dir=""
diff --git a/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb b/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
index 747d5d4c44..6738921d9a 100644
--- a/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
+++ b/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
@@ -1,5 +1,5 @@
 # GDB multiline commands
-# VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+# MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 define hello
   echo Hello, world!\n
diff --git a/uvim/runtime/syntax/testdir/input/help.txt b/uvim/runtime/syntax/testdir/input/help.txt
index 2338bbcc94..d7eb03271f 100644
--- a/uvim/runtime/syntax/testdir/input/help.txt
+++ b/uvim/runtime/syntax/testdir/input/help.txt
@@ -1,21 +1,21 @@
 
 
-		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+		  MNV REFERENCE MANUAL	  by Bram Moolenaar
 					  and Somebody Else
 					  and Another Person
 
 
-		  VIM USER MANUAL	  by Bram Moolenaar
+		  MNV USER MANUAL	  by Bram Moolenaar
 					  and Somebody Else
 					  and Another Person
 
 
-VIM HELP FILE FORMAT
+MNV HELP FILE FORMAT
 
 
-Issue #17721 (Strange >vim highlighting in help documentation?)~
+Issue #17721 (Strange >mnv highlighting in help documentation?)~
 
-				*restore-cursor* *last-position-jump*  >vim
+				*restore-cursor* *last-position-jump*  >mnv
     augroup RestoreCursor
       autocmd!
       autocmd BufReadPost *
@@ -37,25 +37,25 @@ recommended style (https://ziglang.org/documentation/master/): >
 
 NOTE, WARNING and DEPRECATED~
 
-When you 'send a file to Vim', Vim changes to that file's directory.  Note,
+When you 'send a file to MNV', MNV changes to that file's directory.  Note,
 however, that any long directory names will appear in their short (MS-DOS)
 form on some Windows versions.  This is a limitation of the Windows "Send To"
 mechanism.
 
 
 EXAMPLE LANGUAGES~
-							*vim9-mix*
-There is one way to use both legacy and Vim9 syntax in one script file: >vim9
+							*mnv9-mix*
+There is one way to use both legacy and MNV9 syntax in one script file: >mnv9
 
-	" legacy Vim script comments may go here
-	if !has('vim9script')
-	   " legacy Vim script commands go here
+	" legacy MNV script comments may go here
+	if !has('mnv9script')
+	   " legacy MNV script commands go here
 	   finish
 	endif
-	vim9script
-	# Vim9 script commands go here
+	mnv9script
+	# MNV9 script commands go here
 
-This allows for writing a script that takes advantage of the Vim9 script
-syntax if possible, but will also work on a Vim version without it.
+This allows for writing a script that takes advantage of the MNV9 script
+syntax if possible, but will also work on a MNV version without it.
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+ mnv:tw=78:ts=8:noet:ft=help:norl:
diff --git a/uvim/runtime/syntax/testdir/input/help_ex_version.txt b/uvim/runtime/syntax/testdir/input/help_ex_version.txt
index 0333abfde0..474e1800f8 100644
--- a/uvim/runtime/syntax/testdir/input/help_ex_version.txt
+++ b/uvim/runtime/syntax/testdir/input/help_ex_version.txt
@@ -6,10 +6,10 @@
 			date is mentioned.  Otherwise a fixed release-date is
 			shown.
 			The following lines contain information about which
-			features were enabled when Vim was compiled.  When
+			features were enabled when MNV was compiled.  When
 			there is a preceding '+', the feature is included,
 			when there is a '-' it is excluded.  To change this,
-			you have to edit feature.h and recompile Vim.
+			you have to edit feature.h and recompile MNV.
 			To check for this in an expression, see |has()|.
 			Here is an overview of the features.
 			The first column shows the smallest version in which
@@ -21,7 +21,7 @@
 			   -    never, feature was removed
 			 (none) system dependent
 			Thus if a feature is marked with "N", it is included
-			in the normal and huge versions of Vim.
+			in the normal and huge versions of MNV.
 
 							*+feature-list*
    *+acl*		|ACL| support included
@@ -69,13 +69,13 @@ m  *+debug*		Compiled for debugging.
 N  *+dialog_gui*	Support for |:confirm| with GUI dialog.
 N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
-N  *+diff*		|vimdiff| and 'diff'
+N  *+diff*		|mnvdiff| and 'diff'
 N  *+digraphs*		|digraphs| *E196*
    *+directx*		Win32 GUI only: DirectX and 'renderoptions'
    *+dnd*		Support for DnD into the "~ register |quote_~|.
 H  *+emacs_tags*	|emacs-tags| files
 N  *+eval*		expression evaluation |eval.txt|
-T  *+ex_extra*		always on now, used to be for Vim's extra Ex commands
+T  *+ex_extra*		always on now, used to be for MNV's extra Ex commands
 N  *+extra_search*	'hlsearch' and 'incsearch' options.
 -  *+farsi*		Removed: |farsi| language
 T  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|  Always enabled since
@@ -105,7 +105,7 @@ H  *+langmap*		'langmap'
 N  *+libcall*		|libcall()|
 N  *+linebreak*		'linebreak', 'breakat' and 'showbreak'
 T  *+lispindent*	'lisp'
-T  *+listcmds*		Vim commands for the list of buffers |buffer-hidden|
+T  *+listcmds*		MNV commands for the list of buffers |buffer-hidden|
 			and argument list |:argdelete|
 T  *+localmap*		Support for mappings local to a buffer |:map-local|
 m  *+lua*		|Lua| interface
@@ -194,8 +194,8 @@ T  *+user_commands*	User-defined commands. |user-commands|
 H  *+vartabs*		Variable-width tab stops. 'vartabstop'
 T  *+vertsplit*		Vertically split windows |:vsplit|; Always enabled
 			since 8.0.1118.
-T  *+vim9script*	|Vim9| script
-N  *+viminfo*		'viminfo'
+T  *+mnv9script*	|MNV9| script
+N  *+mnvinfo*		'mnvinfo'
 T  *+virtualedit*	'virtualedit' Always enabled since 8.1.826.
 T  *+visual*		Visual mode |Visual-mode| Always enabled since 7.4.200.
 T  *+visualextra*	extra Visual mode commands |blockwise-operators|
@@ -227,7 +227,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			be dynamically loaded.
 
 :ve[rsion] {nr}		Is now ignored.  This was previously used to check the
-			version number of a .vimrc file.  It was removed,
+			version number of a .mnvrc file.  It was removed,
 			because you can now use the ":if" command for
 			version-dependent behavior.
 
@@ -235,4 +235,4 @@ N  *+X11*		Unix only: can restore window title |X11|
 :redi[r][!] > {file}	Redirect messages to file {file}.  The messages which
 
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+ mnv:tw=78:ts=8:noet:ft=help:norl:
diff --git a/uvim/runtime/syntax/testdir/input/html.html b/uvim/runtime/syntax/testdir/input/html.html
index a4d0eb5d8f..4a9b7a471d 100644
--- a/uvim/runtime/syntax/testdir/input/html.html
+++ b/uvim/runtime/syntax/testdir/input/html.html
@@ -2,7 +2,7 @@
   HTML Syntax Test File
   Maintainer: Doug Kearns <dougkearns@gmail.com>
   Last Change: 2024 Jun 13
-  VIM_TEST_SETUP let g:html_no_rendering = 1
+  MNV_TEST_SETUP let g:html_no_rendering = 1
 
   TODO: Investigate macOS test failures when comparing italicized text with,
     for example, <em> and <i> elements.  FreeBSD fails with an empty <strike>
diff --git a/uvim/runtime/syntax/testdir/input/html_fold_expr.html b/uvim/runtime/syntax/testdir/input/html_fold_expr.html
index f85e7fa003..81be6463a7 100644
--- a/uvim/runtime/syntax/testdir/input/html_fold_expr.html
+++ b/uvim/runtime/syntax/testdir/input/html_fold_expr.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-VIM_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=expr
+MNV_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=expr
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/html_fold_syntax.html b/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
index 73579aa9a9..6be4ccb9a6 100644
--- a/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
+++ b/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
-VIM_TEST_SETUP let g:html_syntax_folding = 1
-VIM_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=syntax
+MNV_TEST_SETUP let g:html_syntax_folding = 1
+MNV_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=syntax
 
 
 -->
diff --git a/uvim/runtime/syntax/testdir/input/java_annotations.java b/uvim/runtime/syntax/testdir/input/java_annotations.java
index c5871c3c8d..969f3b3be5 100644
--- a/uvim/runtime/syntax/testdir/input/java_annotations.java
+++ b/uvim/runtime/syntax/testdir/input/java_annotations.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
 
 
 import java.lang.annotation.ElementType;
diff --git a/uvim/runtime/syntax/testdir/input/java_annotations_signature.java b/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
index 8236218550..c85732a704 100644
--- a/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/uvim/runtime/syntax/testdir/input/java_comments_html.java b/uvim/runtime/syntax/testdir/input/java_comments_html.java
index 74e0e1515f..6951344443 100644
--- a/uvim/runtime/syntax/testdir/input/java_comments_html.java
+++ b/uvim/runtime/syntax/testdir/input/java_comments_html.java
@@ -1,16 +1,16 @@
-// VIM_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
-// VIM_TEST_SETUP unlet! g:java_no_trail_space_error
-// VIM_TEST_SETUP unlet! g:java_consent_to_html_syntax_folding
-// VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
-// VIM_TEST_SETUP let[g:java_ignore_markdown,g:html_syntax_folding]=[1,1]
-// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"]
+// MNV_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
+// MNV_TEST_SETUP unlet! g:java_no_trail_space_error
+// MNV_TEST_SETUP unlet! g:java_consent_to_html_syntax_folding
+// MNV_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
+// MNV_TEST_SETUP let[g:java_ignore_markdown,g:html_syntax_folding]=[1,1]
+// MNV_TEST_SETUP let g:markdown_fenced_languages = ["java"]
 
 
 
 
-// VIM_TEST_SETUP setlocal spell fdc=2 fdl=64 fdm=syntax fen
-// VIM_TEST_SETUP highlight link javaCommentStart Todo
-// VIM_TEST_SETUP highlight link javaCommentTitle Underlined
+// MNV_TEST_SETUP setlocal spell fdc=2 fdl=64 fdm=syntax fen
+// MNV_TEST_SETUP highlight link javaCommentStart Todo
+// MNV_TEST_SETUP highlight link javaCommentTitle Underlined
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_comments_markdown.java b/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
index c6be7312b0..1e4d56e529 100644
--- a/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
+++ b/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
@@ -1,18 +1,18 @@
-// VIM_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
-// VIM_TEST_SETUP unlet! g:java_no_trail_space_error
-// VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
-// VIM_TEST_SETUP let[g:java_ignore_html,g:markdown_syntax_conceal]=[1,1]
-// VIM_TEST_SETUP let g:html_syntax_folding = 1
-// VIM_TEST_SETUP let g:java_consent_to_html_syntax_folding = 1
-// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"]
-
-
-// VIM_TEST_SETUP defer execute('match Visual /\%>21l\s\+$/')
-// VIM_TEST_SETUP setl spell fdc=2 fdl=64 fdm=syntax fen cole=3 cocu=n
-// VIM_TEST_SETUP highlight link javaCommentStart Todo
-// VIM_TEST_SETUP highlight link javaMarkdownCommentTitle Underlined
-// VIM_TEST_SETUP highlight link markdownH2 NonText
-// VIM_TEST_SETUP highlight link markdownHeadingRule NonText
+// MNV_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
+// MNV_TEST_SETUP unlet! g:java_no_trail_space_error
+// MNV_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
+// MNV_TEST_SETUP let[g:java_ignore_html,g:markdown_syntax_conceal]=[1,1]
+// MNV_TEST_SETUP let g:html_syntax_folding = 1
+// MNV_TEST_SETUP let g:java_consent_to_html_syntax_folding = 1
+// MNV_TEST_SETUP let g:markdown_fenced_languages = ["java"]
+
+
+// MNV_TEST_SETUP defer execute('match Visual /\%>21l\s\+$/')
+// MNV_TEST_SETUP setl spell fdc=2 fdl=64 fdm=syntax fen cole=3 cocu=n
+// MNV_TEST_SETUP highlight link javaCommentStart Todo
+// MNV_TEST_SETUP highlight link javaMarkdownCommentTitle Underlined
+// MNV_TEST_SETUP highlight link markdownH2 NonText
+// MNV_TEST_SETUP highlight link markdownHeadingRule NonText
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java b/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
index c38854d31f..af1377cf2f 100644
--- a/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
+++ b/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP highlight link javaConceptKind NonText
+// MNV_TEST_SETUP highlight link javaConceptKind NonText
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_enfoldment.java b/uvim/runtime/syntax/testdir/input/java_enfoldment.java
index ecf763905f..3afeaaec69 100644
--- a/uvim/runtime/syntax/testdir/input/java_enfoldment.java
+++ b/uvim/runtime/syntax/testdir/input/java_enfoldment.java
@@ -1,15 +1,15 @@
-// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-// VIM_TEST_SETUP let g:java_foldtext_show_first_or_second_line = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-// VIM_TEST_SETUP let g:java_ignore_folding = "x"
-// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
+// MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+// MNV_TEST_SETUP let g:java_foldtext_show_first_or_second_line = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_ignore_folding = "x"
+// MNV_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
 
 
 
 
 
-// VIM_TEST_SETUP highlight link javaBlockOtherStart Structure
-// VIM_TEST_SETUP highlight link javaBlockStart Todo
+// MNV_TEST_SETUP highlight link javaBlockOtherStart Structure
+// MNV_TEST_SETUP highlight link javaBlockStart Todo
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_generics.java b/uvim/runtime/syntax/testdir/input/java_generics.java
index 35f978e0ae..4dc760c6ec 100644
--- a/uvim/runtime/syntax/testdir/input/java_generics.java
+++ b/uvim/runtime/syntax/testdir/input/java_generics.java
@@ -1,11 +1,11 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
 
 
-// VIM_TEST_SETUP hi link javaGenericsC1 Todo
-// VIM_TEST_SETUP hi link javaGenericsC2 Error
-// VIM_TEST_SETUP hi link javaWildcardBound Error
+// MNV_TEST_SETUP hi link javaGenericsC1 Todo
+// MNV_TEST_SETUP hi link javaGenericsC2 Error
+// MNV_TEST_SETUP hi link javaWildcardBound Error
 
 
 import java.math.BigInteger;
diff --git a/uvim/runtime/syntax/testdir/input/java_generics_signature.java b/uvim/runtime/syntax/testdir/input/java_generics_signature.java
index 37617143a4..9c0d4d5ac6 100644
--- a/uvim/runtime/syntax/testdir/input/java_generics_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_generics_signature.java
@@ -1,11 +1,11 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-
-// VIM_TEST_SETUP hi link javaGenericsC1 Todo
-// VIM_TEST_SETUP hi link javaGenericsC2 Error
-// VIM_TEST_SETUP hi link javaWildcardBound Error
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+
+// MNV_TEST_SETUP hi link javaGenericsC1 Todo
+// MNV_TEST_SETUP hi link javaGenericsC2 Error
+// MNV_TEST_SETUP hi link javaWildcardBound Error
 
 
 import java.math.BigInteger;
diff --git a/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java b/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
index 95531f918f..31974a9a0e 100644
--- a/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
+++ b/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
 
 
 import java.lang.annotation.ElementType;
diff --git a/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java b/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
index 0d89e9c8e9..f15c379f17 100644
--- a/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
 
 import java.lang.annotation.ElementType;
 import java.util.function.BinaryOperator;
diff --git a/uvim/runtime/syntax/testdir/input/java_method_references.java b/uvim/runtime/syntax/testdir/input/java_method_references.java
index 640ab1edb0..7942308148 100644
--- a/uvim/runtime/syntax/testdir/input/java_method_references.java
+++ b/uvim/runtime/syntax/testdir/input/java_method_references.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
 
 
 import java.lang.invoke.MethodHandle;
diff --git a/uvim/runtime/syntax/testdir/input/java_method_references_signature.java b/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
index 61e4c0da3a..8abfa1af8e 100644
--- a/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
 
 import java.lang.invoke.MethodHandle;
 import java.util.function.BiPredicate;
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent2.java b/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
index 507bc7333c..ed904eaccb 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent2'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent2'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
index 2fdc5c294c..1594f4f46a 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent2'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent2'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent4.java b/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
index 48f13f8f58..96ed361c11 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent4'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent4'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
index ee101d2a37..6da95e30df 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent4'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent4'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent8.java b/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
index 0c672a8948..ed41f39f44 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent8'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent8'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
index 57c02a42cf..f2f7de17a0 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent8'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent8'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_style.java b/uvim/runtime/syntax/testdir/input/java_methods_style.java
index 50bfa96ba5..e927b817c7 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_style.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_style.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
index a0a3d18bef..f713ebeae6 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_previews_430.java b/uvim/runtime/syntax/testdir/input/java_previews_430.java
index 15d8ba2cea..34f0078ff5 100644
--- a/uvim/runtime/syntax/testdir/input/java_previews_430.java
+++ b/uvim/runtime/syntax/testdir/input/java_previews_430.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_syntax_previews = [430]
+// MNV_TEST_SETUP let g:java_syntax_previews = [430]
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_previews_455.java b/uvim/runtime/syntax/testdir/input/java_previews_455.java
index 69f3798430..ebd9ba0829 100644
--- a/uvim/runtime/syntax/testdir/input/java_previews_455.java
+++ b/uvim/runtime/syntax/testdir/input/java_previews_455.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]
+// MNV_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_unfoldment.java b/uvim/runtime/syntax/testdir/input/java_unfoldment.java
index fb3a96f8e0..ca8760245a 100644
--- a/uvim/runtime/syntax/testdir/input/java_unfoldment.java
+++ b/uvim/runtime/syntax/testdir/input/java_unfoldment.java
@@ -1,15 +1,15 @@
-// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-// VIM_TEST_SETUP let g:java_ignore_folding = "bcdi"
-// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
-// VIM_TEST_SETUP let g:java_mark_braces_in_parens_as_errors = 1
+// MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_ignore_folding = "bcdi"
+// MNV_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
+// MNV_TEST_SETUP let g:java_mark_braces_in_parens_as_errors = 1
 
 
 
 
 
-// VIM_TEST_SETUP highlight link javaBlockOtherStart Structure
-// VIM_TEST_SETUP highlight link javaBlockStart Todo
+// MNV_TEST_SETUP highlight link javaBlockOtherStart Structure
+// MNV_TEST_SETUP highlight link javaBlockStart Todo
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_blocks.vim b/uvim/runtime/syntax/testdir/input/mnv9_blocks.mnv
index 20a68fc5ab..26bbbb388c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_blocks.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_blocks.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 blocks
-# VIM_TESTSETUP set list listchars=trail:-
+mnv9script
+# MNV9 blocks
+# MNV_TESTSETUP set list listchars=trail:-
 
 
 {
diff --git a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods.mnv
index 5b49ae91f8..b05b36ea88 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 special methods - new*(), empty(), len(), string()
+mnv9script
+# MNV9 special methods - new*(), empty(), len(), string()
 
 
 def new()
diff --git a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods2.mnv
index 61396c3ba2..8bfbdccc38 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods2.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim |builtin-object-methods| and namesake builtin functions
-# VIM_TEST_SETUP hi link vim9MethodName Special
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV |builtin-object-methods| and namesake builtin functions
+# MNV_TEST_SETUP hi link mnv9MethodName Special
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class PairClassTest
diff --git a/uvim/runtime/syntax/testdir/input/vim9_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv9_comment_strings.mnv
index 854f7d76bc..adfae6493e 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_comment_strings.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 comment strings
-# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
+mnv9script
+# MNV9 comment strings
+# MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:true
 
 
 # pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim9_comments.vim b/uvim/runtime/syntax/testdir/input/mnv9_comments.mnv
index 360bb57833..0aafc3114a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_comments.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 comments
+mnv9script
+# MNV9 comments
 
 
-# Vim9-script comment
+# MNV9-script comment
 
  # string only recognised with leading char
  "useless string"
@@ -13,17 +13,17 @@ function! Foo()
 endfunction
 
 def! Bar()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 enddef
 
 command -count FooCommand {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
 autocmd BufNewFile * {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
@@ -81,7 +81,7 @@ endif
 
 
 # PR: #14975
-# https://github.com/vim/vim/pull/14975#issuecomment-2832643115
+# https://github.com/Project-Tick/Project-Tick/pull/14975#issuecomment-2832643115
 
 var d = {
     a: 0,
@@ -92,8 +92,8 @@ b: 0,
 
 
 # PR: #19390
-# https://github.com/vim/vim/pull/19390#issue-3933755846
+# https://github.com/Project-Tick/Project-Tick/pull/19390#issue-3933755846
 
-# E1234: should not have vim9CommentTitle on 'E1234:'
-# ERR34: should have vim9CommentTitle on 'ERR34:'
+# E1234: should not have mnv9CommentTitle on 'E1234:'
+# ERR34: should have mnv9CommentTitle on 'ERR34:'
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_constructors.vim b/uvim/runtime/syntax/testdir/input/mnv9_constructors.mnv
index 3b49969e27..ca424a53c4 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_constructors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_constructors.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 constructors
+mnv9script
+# MNV9 constructors
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_def_variables.vim b/uvim/runtime/syntax/testdir/input/mnv9_def_variables.mnv
index a058bcf950..4c0d8aae78 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_def_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_def_variables.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 function variables
+mnv9script
+# MNV9 function variables
 
 
 def Foo()
@@ -214,7 +214,7 @@ for k in keys(t:) | echo t:[k] | endfor
 for k in keys(g:) | echo g:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-# Neovim-specific variables (not highlighted by default)
+# Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_class_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_class_fold.mnv
index ea89b9dfc0..35f953011e 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_class_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_class_fold.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :class command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'cfi'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 :class command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'cfi'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_commands.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_commands.mnv
index 90da5e812b..f484b2b254 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_commands.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 Ex commands
+mnv9script
+# MNV9 Ex commands
 
 
 # START NOT MATCHED
@@ -208,7 +208,7 @@ vim9script
 :grep
 :grepadd
 :gui
-:gvim
+:gmnv
 :hardcopy
 :help
 :helpclose
@@ -304,8 +304,8 @@ vim9script
 :luado
 :luafile
 :lunmap
-:lvimgrep
-:lvimgrepadd
+:lmnvgrep
+:lmnvgrepadd
 :lwindow
 :make
 :mapclear
@@ -320,7 +320,7 @@ vim9script
 :mksession
 :mkspell
 :mkview
-:mkvimrc
+:mkmnvrc
 :move
 :mzfile
 :mzscheme
@@ -416,7 +416,7 @@ vim9script
 :rubyfile
 :rundo
 :runtime
-:rviminfo
+:rmnvinfo
 :sall
 :sandbox
 :sargument
@@ -550,10 +550,10 @@ vim9script
 :vertical
 :vglobal/.../
 :view
-:vim9cmd
-# :vim9script
-:vimgrep
-:vimgrepadd
+:mnv9cmd
+# :mnv9script
+:mnvgrep
+:mnvgrepadd
 :visual
 :viusage
 :vmap
@@ -578,7 +578,7 @@ vim9script
 :wqall
 :write
 :wundo
-:wviminfo
+:wmnvinfo
 :xall
 :xmap
 :xmapclear
@@ -789,7 +789,7 @@ Foo() | goto
 Foo() | grep
 Foo() | grepadd
 Foo() | gui
-Foo() | gvim
+Foo() | gmnv
 Foo() | hardcopy
 Foo() | help
 Foo() | helpclose
@@ -884,8 +884,8 @@ Foo() | lua
 Foo() | luado
 Foo() | luafile
 Foo() | lunmap
-Foo() | lvimgrep
-Foo() | lvimgrepadd
+Foo() | lmnvgrep
+Foo() | lmnvgrepadd
 Foo() | lwindow
 Foo() | make
 Foo() | mark
@@ -901,7 +901,7 @@ Foo() | mkexrc
 Foo() | mksession
 Foo() | mkspell
 Foo() | mkview
-Foo() | mkvimrc
+Foo() | mkmnvrc
 Foo() | mzfile
 Foo() | mzscheme
 Foo() | nbclose
@@ -996,7 +996,7 @@ Foo() | rubydo
 Foo() | rubyfile
 Foo() | rundo
 Foo() | runtime
-Foo() | rviminfo
+Foo() | rmnvinfo
 Foo() | sall
 Foo() | sandbox
 Foo() | sargument
@@ -1129,10 +1129,10 @@ Foo() | verbose
 Foo() | version
 Foo() | vertical
 Foo() | vglobal/.../
-Foo() | vim9cmd
-# call Foo() | vim9script
-Foo() | vimgrep
-Foo() | vimgrepadd
+Foo() | mnv9cmd
+# call Foo() | mnv9script
+Foo() | mnvgrep
+Foo() | mnvgrepadd
 Foo() | visual
 Foo() | viusage
 Foo() | view
@@ -1158,7 +1158,7 @@ Foo() | wprevious
 Foo() | wq
 Foo() | wqall
 Foo() | wundo
-Foo() | wviminfo
+Foo() | wmnvinfo
 Foo() | xall
 Foo() | xmapclear
 Foo() | xmap
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_echo.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_echo.mnv
index e09dd04c0a..c08b43322f 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_echo.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_echo.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :echo commands
-# VIM_TEST_SETUP hi link vimVar Identifier
+mnv9script
+# MNV9 :echo commands
+# MNV_TEST_SETUP hi link mnvVar Identifier
 
 
 echo         # comment
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum.mnv
index 8529deda24..4f6eec4da6 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim :enum command
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
+mnv9script
+# MNV :enum command
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum2.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum2.mnv
index f602d794fe..84d1096857 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum2.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :enum command
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
-# See: https://github.com/vim/vim/pull/16365#issuecomment-2571420551
+mnv9script
+# MNV9 :enum command
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16365#issuecomment-2571420551
 
 
 enum Letter
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum_fold.mnv
index b4769d5813..e05220622c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum_fold.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 :enum command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'efi'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
+mnv9script
+# MNV9 :enum command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'efi'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_for.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_for.mnv
index f23b3cc505..95efb2f0f1 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_for.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_for.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :for command
+mnv9script
+# MNV9 :for command
 
 
 # :for {var} in {object}
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comment_errors.mnv
index dda1449584..2db5cdee53 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comment_errors.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :function and :def tail comment errors
-# VIM_TEST_SETUP unlet! g:vimsyn_folding
+mnv9script
+# MNV9 :function and :def tail comment errors
+# MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun Test1() abort		# fun
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comments.mnv
index b2803854d4..cac7aeefde 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comments.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :function and :def tail comments
-# VIM_TEST_SETUP unlet! g:vimsyn_folding
+mnv9script
+# MNV9 :function and :def tail comments
+# MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun Test1() abort		" fun
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv b/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv
new file mode 100644
index 0000000000..9b6be57ce2
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv
@@ -0,0 +1,120 @@
+mnv9script
+# MNV9 :import command
+# MNV_TEST_SETUP hi link mnvImportName Todo
+
+
+import "foo.mnv"
+import true ? "foo.mnv" : "bar.mnv"
+
+import true ?
+  "foo.mnv" :
+  "bar.mnv"
+
+import true
+  ? "foo.mnv"
+  : "bar.mnv"
+
+import true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+
+import true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+
+import "foo.mnv" as bar
+import true ? "foo.mnv" : "bar.mnv" as baz
+
+import true ?
+  "foo.mnv" :
+  "bar.mnv"
+  as baz
+
+import true
+  ? "foo.mnv"
+  : "bar.mnv"
+  as baz
+
+import true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+  # comment
+  as baz
+
+import true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+  # comment
+  as baz
+
+echo "Foo" | import "foo.mnv"
+
+
+# autoload
+
+import autoload "foo.mnv"
+import autoload true ? "foo.mnv" : "bar.mnv"
+
+import autoload true ?
+  "foo.mnv" :
+  "bar.mnv"
+
+import autoload true
+  ? "foo.mnv"
+  : "bar.mnv"
+
+import autoload true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+
+import autoload true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+
+import autoload "foo.mnv" as bar
+import autoload true ? "foo.mnv" : "bar.mnv" as baz
+
+import autoload true ?
+  "foo.mnv" :
+  "bar.mnv"
+  as baz
+
+import autoload true
+  ? "foo.mnv"
+  : "bar.mnv"
+  as baz
+
+import autoload true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+  # comment
+  as baz
+
+import autoload true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+  # comment
+  as baz
+
+
+# "as" keyword in expr
+
+var as = "modules/"
+import true ? as .. "foo.mnv" : as .. "bar.mnv" as other
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_interface_fold.mnv
index f108e749a0..a64302c682 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_interface_fold.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :interface command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'i'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 :interface command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'i'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_let_heredoc.mnv
index 184089c819..9697d91de2 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_let_heredoc.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 heredoc
-# VIM_TEST_SETUP let g:vimsyn_folding = "h"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 heredoc
+# MNV_TEST_SETUP let g:mnvsyn_folding = "h"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 var foo =<< END
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_loadkeymap.mnv
index b6b5fece9d..5fd5bc36b3 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_loadkeymap.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :loadkeymap command
+mnv9script
+# MNV9 :loadkeymap command
 
 
 scriptencoding utf-8
@@ -20,9 +20,9 @@ a A    Basic mapping
 c              <char-0103>     Special notation allowed in RHS - octal
 <char-0x0064>  <char-0x0044>   Special notation allowed in LHS and RHS - hexadecimal
 
-# Vim-script comment characters
-\# <char-0x00a3>               Line should not match as a Vim9-script comment
+# MNV-script comment characters
+\# <char-0x00a3>               Line should not match as a MNV9-script comment
 # Line should not match as a legacy-script comment
 " “
-: #                            Line should not match as a Vim9-script comment
+: #                            Line should not match as a MNV9-script comment
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_type.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_type.mnv
index 1408ac8555..af82f9912c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_type.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_type.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :type command
+mnv9script
+# MNV9 :type command
 
 
 type Foo = string
diff --git a/uvim/runtime/syntax/testdir/input/vim9_expressions.vim b/uvim/runtime/syntax/testdir/input/mnv9_expressions.mnv
index 05a9fe7235..5fd25b024a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_expressions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_expressions.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 expressions
+mnv9script
+# MNV9 expressions
 
 
 # Boolean
@@ -180,7 +180,7 @@ def Foo(): bool
 enddef
 
 
-# Issue #14423 (vim.vim: Opt out of vimSearch*)
+# Issue #14423 (mnv.mnv: Opt out of mnvSearch*)
 
 :?truthy
 const truthy: number = false
@@ -201,7 +201,7 @@ def Foo()
 enddef
 
 
-# Issue #16227 (Vim script ternary expression highlighting)
+# Issue #16227 (MNV script ternary expression highlighting)
 
 var foo = 'foo'                         # comment
 var bar = foo == 'foo' ? 'bar' : 'baz'
diff --git a/uvim/runtime/syntax/testdir/input/vim9_function_calls.vim b/uvim/runtime/syntax/testdir/input/mnv9_function_calls.mnv
index 63e82c662f..65369c66c9 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_function_calls.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_function_calls.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 function calls
-# VIM_TEST_SETUP hi link vimUserFunc Todo
-# VIM_TEST_SETUP hi link vim9UserFunc Todo
+mnv9script
+# MNV9 function calls
+# MNV_TEST_SETUP hi link mnvUserFunc Todo
+# MNV_TEST_SETUP hi link mnv9UserFunc Todo
 
 
 call abs(42)
@@ -300,11 +300,11 @@ module.foo().bar()
 module.foo().substitute()
 
 
-# Issue 16721 (Vim script highlight of builtin function after |)
+# Issue 16721 (MNV script highlight of builtin function after |)
 
-&directory = $'{$MYVIMDIR}/.data/swap/'
-&backupdir = $'{$MYVIMDIR}/.data/backup//'
-&undodir = $'{$MYVIMDIR}/.data/undo//'
+&directory = $'{$MYMNVDIR}/.data/swap/'
+&backupdir = $'{$MYMNVDIR}/.data/backup//'
+&undodir = $'{$MYMNVDIR}/.data/undo//'
 if !isdirectory(&undodir)   | mkdir(&undodir, "p")   | endif
 if !isdirectory(&backupdir) | mkdir(&backupdir, "p") | endif
 if !isdirectory(&directory) | mkdir(&directory, "p") | endif
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_enum.mnv
index 037392134b..00621dea4d 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_enum.mnv
@@ -1,9 +1,9 @@
-vim9script
-# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo
-# VIM_TEST_SETUP highlight link vim9EnumValue Identifier
-# VIM_TEST_SETUP let g:vimsyn_folding = "ef"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3033537127 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP highlight link mnv9DefTypeParam Todo
+# MNV_TEST_SETUP highlight link mnv9EnumValue Identifier
+# MNV_TEST_SETUP let g:mnvsyn_folding = "ef"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3033537127 (Aliaksei Budavei)
 
 
 enum CommonPair
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_list.mnv
index f1abbdb3b1..8fb745ad1a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_list.mnv
@@ -1,11 +1,11 @@
-vim9script
-# VIM_TEST_SETUP let g:vimsyn_folding = "cfi"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cfi"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
 
-# See https://github.com/vim/vim/pull/16604#issuecomment-265202845 .
+# See https://github.com/Project-Tick/Project-Tick/pull/16604#issuecomment-265202845 .
 export interface Listable
     def Cons<E>(_: E): Listable
     def Reverse<E>(): Listable
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_set.mnv
index fb8f65116e..71c8912cd4 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_set.mnv
@@ -1,10 +1,10 @@
-vim9script
-# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cf"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
-# See https://github.com/vim/vim/issues/14330#issuecomment-2028938515 .
+# See https://github.com/Project-Tick/Project-Tick/issues/14330#issuecomment-2028938515 .
 export class Set
     final _elements: dict<number>
     const _Mapper: func(number, string): any
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_functions.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_functions.mnv
index 4800752d3f..fed2cced45 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_functions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_functions.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 generic functions
-# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
+mnv9script
+# MNV9 generic functions
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cf"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
 
 
 # :help generic-functions
@@ -78,7 +78,7 @@ class Bar extends Foo
 endclass
 
 
-# Issue: https://github.com/vim/vim/pull/17722#issuecomment-3075531052
+# Issue: https://github.com/Project-Tick/Project-Tick/pull/17722#issuecomment-3075531052
 
 export def Id<U>(): func(U): U
     return (X_: U) => X_
diff --git a/uvim/runtime/syntax/testdir/input/vim9_lambdas.vim b/uvim/runtime/syntax/testdir/input/mnv9_lambdas.mnv
index 4f7d1cde3c..667dcd2bac 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_lambdas.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_lambdas.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 lambda expressions
-# VIM_TEST_SETUP hi link vim9LambdaOperator Todo
-# VIM_TEST_SETUP hi link vim9LambdaParen Todo
+mnv9script
+# MNV9 lambda expressions
+# MNV_TEST_SETUP hi link mnv9LambdaOperator Todo
+# MNV_TEST_SETUP hi link mnv9LambdaParen Todo
 
 
 var Foo: func
@@ -117,7 +117,7 @@ echo (() => 42)()
 echo ((x: string): number => 42)("foo")
 
 
-# :help vim9-lambda
+# :help mnv9-lambda
 
 var list = [1, 2, 3]
 echo filter(list, (k, v) =>
@@ -146,15 +146,15 @@ var d = mapnew(dict, (k, v): string => {
    })
 
 
-# Issue #15970 (vim9: Restore and extend the recognition of Enum body items)
+# Issue #15970 (mnv9: Restore and extend the recognition of Enum body items)
 
 def Op(): func(func(number, number): number): func(number, Digit): number
     return (F: func(number, number): number) =>
 	(x: number, y: Digit): number => F(x, y.value)
-enddef ####################### ^ vimCommand?
+enddef ####################### ^ mnvCommand?
 
 
-# Issue #16965 (vim syntax: wrong highlight with lambda, autoload, and false keyword)
+# Issue #16965 (mnv syntax: wrong highlight with lambda, autoload, and false keyword)
 
 autocmd BufRead * timer_start(0, (_) => f#a(false, false))
 autocmd
diff --git a/uvim/runtime/syntax/testdir/input/vim9_legacy_header.vim b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header.mnv
index 75fde68c68..d9afd0c86c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_legacy_header.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header.mnv
@@ -1,17 +1,17 @@
-" Vim9 legacy script header
+" MNV9 legacy script header
 
 
 " comment
 
-if !has('vim9script')
+if !has('mnv9script')
   # 42 " comment
-  source foo.vim
+  source foo.mnv
   finish
 endif
 
 " comment
 
-vim9script noclear
+mnv9script noclear
 
 # comment
 
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv
new file mode 100644
index 0000000000..e6b0751ae3
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv
@@ -0,0 +1,22 @@
+" MNV9 legacy script header
+" MNV_TEST_SETUP let g:mnvsyn_folding = "H"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+
+
+" comment
+
+if !has('mnv9script')
+  # 42 " comment
+  source foo.mnv
+  finish
+endif
+
+" comment
+
+mnv9script noclear
+
+# comment
+
+ # string only recognised with leading char
+ "useless string"
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_no_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv9_no_comment_strings.mnv
index b9bdddb914..270f2cf31c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_no_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_no_comment_strings.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 no comment strings
-# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
+mnv9script
+# MNV9 no comment strings
+# MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:false
 
 
 # pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv b/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv
new file mode 100644
index 0000000000..60f8f0fc7e
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv
@@ -0,0 +1,8 @@
+#!/usr/bin/env mnv -S
+mnv9script
+# MNV9 shebang line
+
+
+# just a line comment
+#!/usr/bin/env mnv -S
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords.mnv
index 43f29fedee..fbb35ae5d6 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9This Todo
-# VIM_TEST_SETUP hi link vim9Super Todo
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9This Todo
+# MNV_TEST_SETUP hi link mnv9Super Todo
 
 
 def Echo(...args: list<any>)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords2.mnv
index 8db05e5501..dbf20dfc92 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords2.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9Super Todo
-# VIM_TEST_SETUP hi link vim9This Todo
-# See: https://github.com/vim/vim/pull/16476#issuecomment-2638191110
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9Super Todo
+# MNV_TEST_SETUP hi link mnv9This Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16476#issuecomment-2638191110
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords3.mnv
index a80c8c8737..6412cf2b95 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords3.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9Super Todo
-# VIM_TEST_SETUP hi link vim9This Todo
-# See: https://github.com/vim/vim/pull/16476#issuecomment-2635119478
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9Super Todo
+# MNV_TEST_SETUP hi link mnv9This Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16476#issuecomment-2635119478
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_tuples.vim b/uvim/runtime/syntax/testdir/input/mnv9_tuples.mnv
index 2470f38b2f..946a6be1b7 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_tuples.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_tuples.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 tuples
+mnv9script
+# MNV9 tuples
 
 
-# https://github.com/vim/vim/pull/16935#issuecomment-2738310273
+# https://github.com/Project-Tick/Project-Tick/pull/16935#issuecomment-2738310273
 
 function LegacyMakeEntry(key, value) abort
     return (a:key, a:value)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types.vim b/uvim/runtime/syntax/testdir/input/mnv9_types.mnv
index 97a3636fcb..b68d2a2126 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 types
-# VIM_TEST_SETUP hi link vimTypeAny Todo
-# VIM_TEST_SETUP hi link vim9VariableTypeAny Todo
+mnv9script
+# MNV9 types
+# MNV_TEST_SETUP hi link mnvTypeAny Todo
+# MNV_TEST_SETUP hi link mnv9VariableTypeAny Todo
 
 
 # builtin types (distinct any highlighting)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types_example_object.vim b/uvim/runtime/syntax/testdir/input/mnv9_types_example_object.mnv
index f5f902db7f..11ac3cd68d 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types_example_object.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types_example_object.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 object type constructor
+mnv9script
+# MNV9 object type constructor
 
 
 # Issue #18677 (No recognition of object<any> types - Aliaksei Budavei)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types_object.vim b/uvim/runtime/syntax/testdir/input/mnv9_types_object.mnv
index 7cf6eec05a..266aa02c71 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types_object.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types_object.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 object type constructor
-# VIM_TEST_SETUP hi link vimTypeObject Todo
-# VIM_TEST_SETUP hi link vimTypeObjectBracket Title
+mnv9script
+# MNV9 object type constructor
+# MNV_TEST_SETUP hi link mnvTypeObject Todo
+# MNV_TEST_SETUP hi link mnvTypeObjectBracket Title
 
 
 interface I
diff --git a/uvim/runtime/syntax/testdir/input/vim9_variables.vim b/uvim/runtime/syntax/testdir/input/mnv9_variables.mnv
index 7344db8ce1..8e307f060f 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_variables.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 variable highlighting
+mnv9script
+# MNV9 variable highlighting
 
 
 # Declarations
@@ -259,7 +259,7 @@ for k in keys(t:) | echo t:[k] | endfor
 for k in keys(g:) | echo g:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-# Neovim-specific variables (not highlighted by default)
+# Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv_comment_strings.mnv
index 0626403941..11707b045a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_comment_strings.mnv
@@ -1,5 +1,5 @@
-" Vim comment strings
-" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
+" MNV comment strings
+" MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:true
 
 
 " pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim_comments.vim b/uvim/runtime/syntax/testdir/input/mnv_comments.mnv
index 6c1f990a05..6bfa03aec3 100644
--- a/uvim/runtime/syntax/testdir/input/vim_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_comments.mnv
@@ -1,4 +1,4 @@
-" Vim comments
+" MNV comments
 
 
 " Legacy-script comment
@@ -11,17 +11,17 @@ function! Foo()
 endfunction
 
 def! Bar()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 enddef
 
 command -nargs=1 FooCommand {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
 autocmd BufNewFile * {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
@@ -74,10 +74,10 @@ enddef
 
 
 " PR: #19390
-" https://github.com/vim/vim/pull/19390#issue-3933755846
+" https://github.com/Project-Tick/Project-Tick/pull/19390#issue-3933755846
 
 def CommentTitle2()
-  # E1234: should not have vim9CommentTitle on 'E1234:'
-  # ERR34: should have vim9CommentTitle on 'ERR34:'
+  # E1234: should not have mnv9CommentTitle on 'E1234:'
+  # ERR34: should have mnv9CommentTitle on 'ERR34:'
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_abbreviate.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_abbreviate.mnv
index 5965311e82..c40b47e229 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_abbreviate.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_abbreviate.mnv
@@ -1,7 +1,7 @@
-" Vim :abbreviate commands
-" VIM_TEST_SETUP hi link vimMapLhs Identifier
-" VIM_TEST_SETUP hi link vimMapRhs Todo
-" VIM_TEST_SETUP hi link vimMapRhsContinue Todo
+" MNV :abbreviate commands
+" MNV_TEST_SETUP hi link mnvMapLhs Identifier
+" MNV_TEST_SETUP hi link mnvMapRhs Todo
+" MNV_TEST_SETUP hi link mnvMapRhsContinue Todo
 
 
 abbrev <buffer> foo foobar
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_at.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_at.mnv
index 5994088ec2..c0674a4945 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_at.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_at.mnv
@@ -1,4 +1,4 @@
-" Vim :@ command
+" MNV :@ command
 
 
 @0
@@ -32,7 +32,7 @@
 @a " comment
 
 
-def Vim9Context()
+def MNV9Context()
   :@0
   :@1
   :@2
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_augroup.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_augroup.mnv
index 3f43a7553e..c5a34ea9ba 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_augroup.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_augroup.mnv
@@ -1,7 +1,7 @@
-" Vim :augroup command
-" VIM_TEST_SETUP let g:vimsyn_folding = "a"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
-" VIM_TEST_SETUP hi link vimAugroupName Todo
+" MNV :augroup command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "a"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV_TEST_SETUP hi link mnvAugroupName Todo
 
 
 augroup foo
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_autocmd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_autocmd.mnv
index 2216a427ec..e864479641 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_autocmd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_autocmd.mnv
@@ -1,6 +1,6 @@
-" Vim :autocmd command
-" VIM_TEST_SETUP hi link vimAutoCmdGroup Todo
-" VIM_TEST_SETUP hi link vimUserAutoEvent Title
+" MNV :autocmd command
+" MNV_TEST_SETUP hi link mnvAutoCmdGroup Todo
+" MNV_TEST_SETUP hi link mnvUserAutoEvent Title
 
 
 " Define
@@ -99,10 +99,10 @@ autocmd foogroup BufRead *.txt
 
 " Multiple patterns
 
-autocmd BufRead *.txt,*.vim,*.c      echo "Foo" | echo "Bar"
-autocmd BufRead <buffer>,*.vim,*.c   echo "Foo" | echo "Bar"
+autocmd BufRead *.txt,*.mnv,*.c      echo "Foo" | echo "Bar"
+autocmd BufRead <buffer>,*.mnv,*.c   echo "Foo" | echo "Bar"
 autocmd BufRead *.txt,<buffer>,*.c   echo "Foo" | echo "Bar"
-autocmd BufRead *.txt,*.vim,<buffer> echo "Foo" | echo "Bar"
+autocmd BufRead *.txt,*.mnv,<buffer> echo "Foo" | echo "Bar"
 
 autocmd BufRead <buffer=1>,<buffer=2>,<buffer=3> echo "Foo" | echo "Bar"
 
@@ -245,8 +245,8 @@ au BufRead */*.[^-t-]xt
 au BufRead */*.[\^]xt
 au BufRead */*.[^^]xt
 
-au BufRead */*.txt,*/*.vim
-au BufRead */*.{txt,vim}
+au BufRead */*.txt,*/*.mnv
+au BufRead */*.{txt,mnv}
 au BufRead */*.{t{x,t},v{i,m}}
 
 " literal
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_behave.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_behave.mnv
index 6f5e5ec124..7f06fe6076 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_behave.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_behave.mnv
@@ -1,4 +1,4 @@
-" Vim :behave command
+" MNV :behave command
 
 
 behave mswin
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_breakpoint_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_breakpoint_commands.mnv
index 565cea3258..671646908c 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_breakpoint_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_breakpoint_commands.mnv
@@ -1,9 +1,9 @@
-" Vim :break* commands
-" VIM_TEST_SETUP hi link vimBreakpointNumber Number
-" VIM_TEST_SETUP hi link vimBreakpointFunctionLine Number
-" VIM_TEST_SETUP hi link vimBreakpointFileLine Number
-" VIM_TEST_SETUP hi link vimBreakpointFilename Identifier
-" VIM_TEST_SETUP hi link vimBreakpointFunction Type
+" MNV :break* commands
+" MNV_TEST_SETUP hi link mnvBreakpointNumber Number
+" MNV_TEST_SETUP hi link mnvBreakpointFunctionLine Number
+" MNV_TEST_SETUP hi link mnvBreakpointFileLine Number
+" MNV_TEST_SETUP hi link mnvBreakpointFilename Identifier
+" MNV_TEST_SETUP hi link mnvBreakpointFunction Type
 
 
 breakadd func Foo
@@ -40,7 +40,7 @@ function Foo()
   breakdel file 42 foo.txt
 endfunction
 
-def Vim9Context()
+def MNV9Context()
   breakadd func Foo
   breakadd func 42 Foo
   breakadd file foo.txt
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_call.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_call.mnv
index 809a4103f3..5e2a8caf9f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_call.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_call.mnv
@@ -1,4 +1,4 @@
-" Vim :call command
+" MNV :call command
 
 
 " Functions with same-named Ex commands
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv
new file mode 100644
index 0000000000..20bf351551
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv
@@ -0,0 +1,19 @@
+" MNV :catch command
+
+
+" :help :catch
+
+catch /^MNV:Interrupt$/		" catch interrupts (CTRL-C)
+catch /^MNV\%((\a\+)\)\=:E/	" catch all MNV errors
+catch /^MNV\%((\a\+)\)\=:/	" catch errors and interrupts
+catch /^MNV(write):/		" catch all errors in :write
+catch /^MNV\%((\a\+)\)\=:E123:/	" catch error E123
+catch /my-exception/		" catch user exception
+catch /.*/			" catch everything
+catch				" same as /.*/
+
+" :help :try
+
+try | sleep 100 | catch /^MNV:Interrupt$/ | endtry
+try | edit | catch /^MNV(edit):E\d\+/ | echo "error" | endtry
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_cd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_cd.mnv
index 21adc31615..6ed6f779e6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_cd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_cd.mnv
@@ -1,5 +1,5 @@
-" Vim :cd commands
-" VIM_TEST_SETUP hi link vimCdArg Todo
+" MNV :cd commands
+" MNV_TEST_SETUP hi link mnvCdArg Todo
 
 
 cd
@@ -99,7 +99,7 @@ tchdir  foo " comment
 tchdir! foo " comment
 
 
-" Issue #17964 (Vim script highlight: endif is not highlighted after lcd)
+" Issue #17964 (MNV script highlight: endif is not highlighted after lcd)
 
 def LcdBack()
     if get(g:, "lcd", 0)
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_command.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_command.mnv
index a2f01a708e..79ac94b702 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_command.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_command.mnv
@@ -1,6 +1,6 @@
-" Vim :command, :delcommand and :comclear commands
-" VIM_TEST_SETUP hi link vimUserCmdName Todo
-" VIM_TEST_SETUP hi link vimDelcommandName Todo
+" MNV :command, :delcommand and :comclear commands
+" MNV_TEST_SETUP hi link mnvUserCmdName Todo
+" MNV_TEST_SETUP hi link mnvDelcommandName Todo
 
 
 " List
@@ -133,12 +133,12 @@ comclear " comment
 comclear | echo "Foo"
 
 
-" Issue #14135 (vim.vim syntax highlighting broken wrt system())
+" Issue #14135 (mnv.mnv syntax highlighting broken wrt system())
 
 com Foo call system('ls')
 
 
-" Issue #17001 (Wrong vimUserCmdAttrError highlighting in vim.vim)
+" Issue #17001 (Wrong mnvUserCmdAttrError highlighting in mnv.mnv)
 
 command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ <args>
 
@@ -170,9 +170,9 @@ command! Foo
       \ echo "Foo"
 
 
-" Issue #18414 (Syntax group vimUserCmdReplacement lacking a keepend?)
+" Issue #18414 (Syntax group mnvUserCmdReplacement lacking a keepend?)
 
-def Vim9Context()
+def MNV9Context()
   command! MyFunction MyFunc()
   # I am a comment
 
@@ -189,7 +189,7 @@ command! ToggleWrap setlocal wrap!
 
 " Issue #18448 (comment for subsequent command is not highlighted)
 
-def Vim9Context()
+def MNV9Context()
   command! -nargs=1 -complete=file Rg :term rg <args>
   # command! -nargs=1 -complete=file Rg :term ++shell rg <args>
 enddef
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_command_modifiers.mnv
index 64b4782f69..5c4443a667 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_command_modifiers.mnv
@@ -1,4 +1,4 @@
-" Vim Ex command modifiers
+" MNV Ex command modifiers
 
 
  aboveleft        echo "Foo"
@@ -30,7 +30,7 @@ topleft           echo "Foo"
 unsilent          echo "Foo"
 verbose           echo "Foo"
 vertical          echo "Foo"
-vim9cmd           echo "Foo"
+mnv9cmd           echo "Foo"
 
 
 :  aboveleft       echo "Foo"
@@ -65,7 +65,7 @@ vim9cmd           echo "Foo"
 :unsilent          echo "Foo"
 :verbose           echo "Foo"
 :vertical          echo "Foo"
-:vim9cmd           echo "Foo"
+:mnv9cmd           echo "Foo"
 
 
 echo|aboveleft           echo "Foo"
@@ -99,10 +99,10 @@ echo | topleft           echo "Foo"
 echo | unsilent          echo "Foo"
 echo | verbose           echo "Foo"
 echo | vertical          echo "Foo"
-echo | vim9cmd           echo "Foo"
+echo | mnv9cmd           echo "Foo"
 
 
-aboveleft belowright botright browse confirm filter /pattern/ filter! /pattern/ hide horizontal keepalt keepjumps keepmarks keeppatterns leftabove legacy lockmarks noautocmd noswapfile rightbelow sandbox silent silent! tab topleft unsilent verbose vertical vim9cmd echo "Foo"
+aboveleft belowright botright browse confirm filter /pattern/ filter! /pattern/ hide horizontal keepalt keepjumps keepmarks keeppatterns leftabove legacy lockmarks noautocmd noswapfile rightbelow sandbox silent silent! tab topleft unsilent verbose vertical mnv9cmd echo "Foo"
 aboveleft
       \ belowright
       \ botright
@@ -130,6 +130,6 @@ aboveleft
       \ unsilent
       \ verbose
       \ vertical
-      \ vim9cmd
+      \ mnv9cmd
       \ echo "Foo"
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_commands.mnv
index 96199acbb5..a573f6a4b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_commands.mnv
@@ -204,7 +204,7 @@
 :grep
 :grepadd
 :gui
-:gvim
+:gmnv
 :hardcopy
 :help
 :helpclose
@@ -303,8 +303,8 @@
 :lua
 :luado
 :luafile
-:lvimgrep
-:lvimgrepadd
+:lmnvgrep
+:lmnvgrepadd
 :lwindow
 :move
 :mark
@@ -319,7 +319,7 @@
 :mkexrc
 :mksession
 :mkspell
-:mkvimrc
+:mkmnvrc
 :mkview
 :mode
 :mzscheme
@@ -417,7 +417,7 @@
 :rubyfile
 :rundo
 :runtime
-:rviminfo
+:rmnvinfo
 :substitute
 :sNext
 :sandbox
@@ -550,9 +550,9 @@
 :version
 :verbose
 :vertical
-:vim9cmd
-:vimgrep
-:vimgrepadd
+:mnv9cmd
+:mnvgrep
+:mnvgrepadd
 :visual
 :viusage
 :view
@@ -578,7 +578,7 @@
 :wq
 :wqall
 :wundo
-:wviminfo
+:wmnvinfo
 :xit
 :xall
 :xmapclear
@@ -788,7 +788,7 @@ call Foo() | goto
 call Foo() | grep
 call Foo() | grepadd
 call Foo() | gui
-call Foo() | gvim
+call Foo() | gmnv
 call Foo() | hardcopy
 call Foo() | help
 call Foo() | helpclose
@@ -888,8 +888,8 @@ call Foo() | lunmap
 call Foo() | lua
 call Foo() | luado
 call Foo() | luafile
-call Foo() | lvimgrep
-call Foo() | lvimgrepadd
+call Foo() | lmnvgrep
+call Foo() | lmnvgrepadd
 call Foo() | lwindow
 call Foo() | move
 call Foo() | mark
@@ -904,7 +904,7 @@ call Foo() | messages
 call Foo() | mkexrc
 call Foo() | mksession
 call Foo() | mkspell
-call Foo() | mkvimrc
+call Foo() | mkmnvrc
 call Foo() | mkview
 call Foo() | mode
 call Foo() | mzscheme
@@ -1002,7 +1002,7 @@ call Foo() | rubydo
 call Foo() | rubyfile
 call Foo() | rundo
 call Foo() | runtime
-call Foo() | rviminfo
+call Foo() | rmnvinfo
 call Foo() | substitute
 call Foo() | sNext
 call Foo() | sandbox
@@ -1135,9 +1135,9 @@ call Foo() | vglobal/.../
 call Foo() | version
 call Foo() | verbose
 call Foo() | vertical
-call Foo() | vim9cmd
-call Foo() | vimgrep
-call Foo() | vimgrepadd
+call Foo() | mnv9cmd
+call Foo() | mnvgrep
+call Foo() | mnvgrepadd
 call Foo() | visual
 call Foo() | viusage
 call Foo() | view
@@ -1163,7 +1163,7 @@ call Foo() | wprevious
 call Foo() | wq
 call Foo() | wqall
 call Foo() | wundo
-call Foo() | wviminfo
+call Foo() | wmnvinfo
 call Foo() | xit
 call Foo() | xall
 call Foo() | xmapclear
@@ -1178,7 +1178,7 @@ call Foo() | yank
 call Foo() | z
 
 
-" Vim9-script only
+" MNV9-script only
 
 :abstract
 :class
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_debug.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_debug.mnv
index 6c9174c366..cf6b71e85e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_debug.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_debug.mnv
@@ -1,4 +1,4 @@
-" Vim :debug command
+" MNV :debug command
 
 
 debug echo "..."
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_debuggreedy.mnv
index 27c93a0e6c..3a0f9cf35d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_debuggreedy.mnv
@@ -1,4 +1,4 @@
-" Vim :debuggreedy command
+" MNV :debuggreedy command
 
 
 debuggreedy
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def.mnv
index 7b1d39f4d1..c4d29ba1be 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def.mnv
@@ -1,4 +1,4 @@
-" Vim :def command
+" MNV :def command
 
 
 " List
@@ -99,7 +99,7 @@ def Foo(
     z: string = "zed")
 enddef
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 def Test(lines: list<number> = [line('.'), line('.')]): void
 enddef
@@ -108,7 +108,7 @@ enddef
 " Comments
 
 def Foo()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string"
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_fold.mnv
index 00aff00e89..30e6b4ae71 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :def command
-" VIM_TEST_SETUP let g:vimsyn_folding = "f"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV :def command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "f"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
 " List
@@ -105,7 +105,7 @@ enddef
 " Comments
 
 def Foo()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string"
 enddef
 
@@ -144,7 +144,7 @@ enddef
 
 " Issue #15671
 " No recognition of :fun or :def bodies commencing with empty lines if
-" g:vimsyn_folding contains "f"
+" g:mnvsyn_folding contains "f"
 
 def MA1()
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested.mnv
index 57800ebcd3..18fc4bc1fb 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :def command (nested)
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV9 :def command (nested)
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class Test
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested_fold.mnv
index 897d25e50f..a1f55d0701 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested_fold.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 :def command (nested)
-# VIM_TEST_SETUP let g:vimsyn_folding = 'f'
-# VIM_TEST_SETUP setl fdc=2 fdm=syntax
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV9 :def command (nested)
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'f'
+# MNV_TEST_SETUP setl fdc=2 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class Test
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_return_type.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_return_type.mnv
index af88721ff4..004f99c011 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_return_type.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_return_type.mnv
@@ -1,9 +1,9 @@
-vim9script
-# Vim9 function return types
-# VIM_TEST_SETUP hi link vimUserType Todo
+mnv9script
+# MNV9 function return types
+# MNV_TEST_SETUP hi link mnvUserType Todo
 
 
-# Issue #14442 (vim.vim: confusion for function return types starting on another line)
+# Issue #14442 (mnv.mnv: confusion for function return types starting on another line)
 
 def TestA______________________________________________________________():
     \ void
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_defer.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_defer.mnv
index dd74f0c6ef..5db0a26f0d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_defer.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_defer.mnv
@@ -1,5 +1,5 @@
-" Vim :defer command
-" VIM_TEST_SETUP hi link vimUserFunc Todo
+" MNV :defer command
+" MNV_TEST_SETUP hi link mnvUserFunc Todo
 
 
 function Foo()
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_delfunction.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_delfunction.mnv
index 04c33e9262..910cb4502e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_delfunction.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_delfunction.mnv
@@ -1,4 +1,4 @@
-" Vim :delfunction command
+" MNV :delfunction command
 
 
 delfunction Foo
@@ -27,7 +27,7 @@ delfunction Foo | echo "Foo"
 delfunction Foo " comment
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (arg named /fu%\[nction]/)
 
 silent! delfunc! func
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_do_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_do_commands.mnv
index a4965940f2..c327cc661e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_do_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_do_commands.mnv
@@ -1,4 +1,4 @@
-" Vim :*do commands
+" MNV :*do commands
 
 
 argdo  echo "..."
@@ -28,7 +28,7 @@ tabdo echo "..."
 windo echo "..."
 
 
-def Vim9Context()
+def MNV9Context()
   argdo  echo "..."
   argdo! echo "..."
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_echo.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_echo.mnv
index 7715df1cbc..7ce2b1287f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_echo.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_echo.mnv
@@ -1,4 +1,4 @@
-" Vim :echo commands
+" MNV :echo commands
 
 
 echo        "Answer = " 42
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_eval.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_eval.mnv
index e4f629337d..91bba9661b 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_eval.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_eval.mnv
@@ -1,4 +1,4 @@
-" Vim :eval command
+" MNV :eval command
 
 
 eval "Foo"->append(0)
@@ -14,7 +14,7 @@ echo "Foo" | eval "Foo"->append(0)
 
 eval "Foo"->append(0) " comment
 
-def Vim9Context()
+def MNV9Context()
   eval "Foo"->append(0) # comment
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_execute.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_execute.mnv
index 5f4b7d47e7..683d0a9d33 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_execute.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_execute.mnv
@@ -1,4 +1,4 @@
-" Vim :execute command
+" MNV :execute command
 
 
 " :help :execute
@@ -51,7 +51,7 @@ execute| echo "Foo"
 " trailing comment needs |
 execute "Foo" | " comment
 
-def Vim9Context()
+def MNV9Context()
   # trailing comment allowed
   execute "Foo" # comment
 enddef
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_filetype.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_filetype.mnv
index 8dd153c522..14fcf92c97 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_filetype.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_filetype.mnv
@@ -1,4 +1,4 @@
-" Vim :filetype command
+" MNV :filetype command
 
 
 filetype
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_filter.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_filter.mnv
index 79471c9f9f..276aee25ea 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_filter.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_filter.mnv
@@ -1,5 +1,5 @@
-" Vim :filter command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :filter command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 filter  pa\%(tt\)ern  oldfiles
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_for.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_for.mnv
index d72f6d6fd1..7649d5dfe6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_for.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_for.mnv
@@ -1,4 +1,4 @@
-" Vim :for command
+" MNV :for command
 
 
 " :for {var} in {object}
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function.mnv
index 8a0f398fe2..ef509f62dd 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function.mnv
@@ -1,4 +1,4 @@
-" Vim :function command
+" MNV :function command
 
 
 " List
@@ -230,7 +230,7 @@ function Foo(...)
 endfunction
 
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 function Test(lines = [line('.'), line('.')])
 endfunction
@@ -257,7 +257,7 @@ echo "Foo" | function Foo()
 endfunction
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (function named /s:fu%\[nction]/)
 
 func! s:func(_, func)
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comment_errors.mnv
index dbcba980b8..020b42d888 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comment_errors.mnv
@@ -1,5 +1,5 @@
-" Vim :function and :def tail comment errors
-" VIM_TEST_SETUP unlet! g:vimsyn_folding
+" MNV :function and :def tail comment errors
+" MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun s:Test1() abort		# fun
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comments.mnv
index a29d3a9988..353e6f68ec 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comments.mnv
@@ -1,5 +1,5 @@
-" Vim :function and :def tail comments
-" VIM_TEST_SETUP unlet! g:vimsyn_folding
+" MNV :function and :def tail comments
+" MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun s:Test1() abort		" fun
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_fold.mnv
index c64c62de86..20d74929fd 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :function command
-" VIM_TEST_SETUP let g:vimsyn_folding = "f"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV :function command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "f"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
 " List
@@ -232,7 +232,7 @@ function Foo(...)
 endfunction
 
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 function Test(lines = [line('.'), line('.')])
 endfunction
@@ -259,7 +259,7 @@ echo "Foo" | function Foo()
 endfunction
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (function named /s:fu%\[nction]/)
 
 func! s:func(_, func)
@@ -308,7 +308,7 @@ endfunction
 
 " Issue #15671
 " No recognition of :fun or :def bodies commencing with empty lines if
-" g:vimsyn_folding contains "f"
+" g:mnvsyn_folding contains "f"
 
 fun FA1()
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested.mnv
index 0e0c36a1fa..a0e787a1ab 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested.mnv
@@ -1,4 +1,4 @@
-" Vim :def and :function commands (nested)
+" MNV :def and :function commands (nested)
 
 
 def FunA(): string
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested_fold.mnv
index a2563b8471..6aa403cb41 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :def and :function commands (nested)
-" VIM_TEST_SETUP let g:vimsyn_folding = 'f'
-" VIM_TEST_SETUP setl fdc=2 fdm=syntax
+" MNV :def and :function commands (nested)
+" MNV_TEST_SETUP let g:mnvsyn_folding = 'f'
+" MNV_TEST_SETUP setl fdc=2 fdm=syntax
 
 
 def FunA(): string
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_grep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_grep.mnv
index 8e4e72df92..9c9ca3def7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_grep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_grep.mnv
@@ -1,6 +1,6 @@
-" Vim :*grep and :*grepadd commands
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimGrepBarEscape Special
+" MNV :*grep and :*grepadd commands
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvGrepBarEscape Special
 
 
 grep  'pat\|tern' foo.txt
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_help.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_help.mnv
index c673fe6b0a..c673fe6b0a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_help.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_help.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_helpgrep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_helpgrep.mnv
index 8c686de073..27b811c24b 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_helpgrep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_helpgrep.mnv
@@ -1,5 +1,5 @@
-" Vim :helpgrep command
-" VIM_TEST_SETUP hi link vimHelpgrepPattern Todo
+" MNV :helpgrep command
+" MNV_TEST_SETUP hi link mnvHelpgrepPattern Todo
 
 
 helpgrep :help
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_highlight.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_highlight.mnv
index 1e53e176ce..bb258b40d4 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_highlight.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_highlight.mnv
@@ -1,5 +1,5 @@
-" Vim :highlight command
-" VIM_TEST_SETUP hi link vimHiGroup Todo
+" MNV :highlight command
+" MNV_TEST_SETUP hi link mnvHiGroup Todo
 
 
 " List
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_history.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_history.mnv
index 42dbcabd7d..e3ca50ec46 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_history.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_history.mnv
@@ -1,5 +1,5 @@
-" Vim :history command
-" VIM_TEST_SETUP hi link vimHistoryRange Todo
+" MNV :history command
+" MNV_TEST_SETUP hi link mnvHistoryRange Todo
 
 history		1,9
 history cmd	1,9
@@ -43,7 +43,7 @@ history all 1,9 | echo "..."
 history all 1,9 " comment
 
 
-def Vim9Context()
+def MNV9Context()
   history		1,9
   history cmd		1,9
   history :		1,9
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv
new file mode 100644
index 0000000000..2cdce587f6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv
@@ -0,0 +1,119 @@
+" MNV :import command
+" MNV_TEST_SETUP hi link mnvImportName Todo
+
+
+import "foo.mnv"
+impor v:true ? "foo.mnv" : "bar.mnv"
+
+import v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+
+import v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+
+import v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+
+import v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+
+import "foo.mnv" as bar
+import v:true ? "foo.mnv" : "bar.mnv" as baz
+
+import v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+      \ as baz
+
+import v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+      \ as baz
+
+import v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+      "\ comment
+      \ as baz
+
+import v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+      "\ comment
+      \ as baz
+
+echo "Foo" | import "foo.mnv"
+
+
+" autoload
+
+import autoload "foo.mnv"
+import autoload v:true ? "foo.mnv" : "bar.mnv"
+
+import autoload v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+
+import autoload v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+
+import autoload v:true ?
+      "\ comment 
+      \"foo.mnv" :
+      "\ comment
+      \ "bar.mnv"
+
+import autoload v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+
+import autoload "foo.mnv" as bar
+import autoload v:true ? "foo.mnv" : "bar.mnv" as baz
+
+import autoload v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+      \ as baz
+
+import autoload v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+      \ as baz
+
+import autoload v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+      "\ comment
+      \ as baz
+
+import autoload v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+      "\ comment
+      \ as baz
+
+
+" "as" keyword in expr
+
+let as = "modules/"
+import v:true ? as .. "foo.mnv" : as .. "bar.mnv" as other
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_language.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_language.mnv
index d4742a412f..ba79cb0557 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_language.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_language.mnv
@@ -1,5 +1,5 @@
-" Vim :language command
-" VIM_TEST_SETUP hi link vimLanguageName Todo
+" MNV :language command
+" MNV_TEST_SETUP hi link mnvLanguageName Todo
 
 
 " print commands
@@ -87,7 +87,7 @@ language ctype    de_DE.UTF-8@euro | echo "..."
 language time     de_DE.UTF-8@euro | echo "..."
 language messages de_DE.UTF-8@euro | echo "..."
 
-def Vim9Context()
+def MNV9Context()
 
   # print commands
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_let_heredoc.mnv
index 7c45ab5e6a..516053a32e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_let_heredoc.mnv
@@ -1,6 +1,6 @@
-" Vim :let heredoc command
-" VIM_TEST_SETUP let g:vimsyn_folding = "h"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :let heredoc command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "h"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 let foo =<< END
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap.mnv
index 853256c911..88fb6e16b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command
+" MNV :loadkeymap command
 
 
 scriptencoding utf-8
@@ -19,8 +19,8 @@ a A    Basic mapping
 c              <char-0103>     Special notation allowed in RHS - octal
 <char-0x0064>  <char-0x0044>   Special notation allowed in LHS and RHS - hexadecimal
 
-" Vim-script comment characters
-# <char-0x00a3>                Line should not match as a Vim9-script comment
+" MNV-script comment characters
+# <char-0x00a3>                Line should not match as a MNV9-script comment
 " Line should not match as a legacy-script comment
 \" “
 : "                            Line should not match as a legacy-script comment
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_bar.mnv
index 4f4c5af40f..e0a722e83d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_bar.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command (after "|")
+" MNV :loadkeymap command (after "|")
 
 
 scriptencoding utf-8
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_colon.mnv
index 9500cbd5bc..ee73b87969 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_colon.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command (after ":")
+" MNV :loadkeymap command (after ":")
 
 
 scriptencoding utf-8
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_tcl.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_lua.mnv
index 2558bb8b97..eace6dea3a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_tcl.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_lua.mnv
@@ -1,7 +1,7 @@
-" Vim :tcl, :tcldo and :tclfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "t"
-" VIM_TEST_SETUP let g:vimsyn_folding = "ft"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :lua, :luado and :luafile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "l"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fl"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_make.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_make.mnv
index 0ef3046d7d..31bbdace62 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_make.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_make.mnv
@@ -1,6 +1,6 @@
-" Vim :*make commands
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimMakeBarEscape Special
+" MNV :*make commands
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvMakeBarEscape Special
 
 
 make
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_map.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_map.mnv
index b7c33ef498..31103f5dd7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_map.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_map.mnv
@@ -1,7 +1,7 @@
-" Vim :map commands
-" VIM_TEST_SETUP hi link vimMapLhs Identifier
-" VIM_TEST_SETUP hi link vimMapRhs Todo
-" VIM_TEST_SETUP hi link vimMapRhsContinue Todo
+" MNV :map commands
+" MNV_TEST_SETUP hi link mnvMapLhs Identifier
+" MNV_TEST_SETUP hi link mnvMapRhs Todo
+" MNV_TEST_SETUP hi link mnvMapRhsContinue Todo
 
 
 map!
@@ -42,7 +42,7 @@ tmapclear <buffer>
 map _l :!ls <Bar> more^M:echo "rhs"<CR>
 " \|        'b' is not in 'cpoptions'
 map _l :!ls \| more^M:echo "rhs"<CR>
-" ^V|       always, in Vim and Vi
+" ^V|       always, in MNV and Vi
 map _l :!ls | more^M:echo "rhs"<CR>
 
 map lhs :search('foo\\|bar')<CR>:echo "rhs"<CR>
@@ -118,7 +118,7 @@ nnoremap <Leader>bar :echo (
 
 
 " Example:
-"   /autoload/netrw.vim
+"   /autoload/netrw.mnv
 
 if !hasmapto('<Plug>NetrwOpenFile')          |nmap <buffer> <silent> <nowait> %	<Plug>NetrwOpenFile|endif
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_mark.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_mark.mnv
index 31df3b2684..59fcb3fb27 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_mark.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mark.mnv
@@ -1,6 +1,6 @@
-" Vim :mark and :k commands
-" :k not available in Vim9
-" VIM_TEST_SETUP hi link vimMarkArg Todo
+" MNV :mark and :k commands
+" :k not available in MNV9
+" MNV_TEST_SETUP hi link mnvMarkArg Todo
 
 
 mark `
@@ -183,7 +183,7 @@ endfunction
 mark "
 mark ^
 mark .
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " mark (
 mark )
 mark {
@@ -194,7 +194,7 @@ mark 9
 k"
 k^
 k.
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " k(
 k)
 k{
@@ -205,7 +205,7 @@ k9
 k "
 k ^
 k .
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " k (
 k )
 k {
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_match.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_match.mnv
index 473cfb366f..7866631e02 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_match.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_match.mnv
@@ -1,4 +1,4 @@
-" Vim :match command
+" MNV :match command
 
 
 match FooGroup /Foo/
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_menu.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_menu.mnv
index 87098e031c..e0981ef46a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_menu.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_menu.mnv
@@ -1,4 +1,4 @@
-" Vim :menu commands
+" MNV :menu commands
 
 
 " :help disable menus
@@ -29,7 +29,7 @@ function Foo()
 endfunction
 
 
-" Example: runtime/menu.vim (modified)
+" Example: runtime/menu.mnv (modified)
 an <silent> 10.330 &File.&Close<Tab>:close :confirm close<CR>
 
 an <silent> 10.330 &File.&Close<Tab>:close
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_menutranslate.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_menutranslate.mnv
index 8986cd36a7..81e67b1bf9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_menutranslate.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_menutranslate.mnv
@@ -1,4 +1,4 @@
-" Vim :menutranslate command
+" MNV :menutranslate command
 
 
 menutranslate clear
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv
new file mode 100644
index 0000000000..a790ba1141
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv
@@ -0,0 +1,69 @@
+" MNV :*mnvgrep and :*mnvgrepadd commands
+" MNV_TEST_SETUP hi link mnvMNVgrepFile Todo
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvMNVgrepBarEscape Special
+
+
+mnvgrep pa\%(tt\)ern   foo.txt
+mnvgrep /pa\%(tt\)ern/ foo.txt
+
+mnvgrep! pa\%(tt\)ern   foo.txt
+mnvgrep! /pa\%(tt\)ern/ foo.txt
+
+mnvgrep /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+mnvgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+mnvgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+mnvgrepadd pa\%(tt\)ern   foo.txt
+mnvgrepadd /pa\%(tt\)ern/ foo.txt
+
+mnvgrepadd! pa\%(tt\)ern   foo.txt
+mnvgrepadd! /pa\%(tt\)ern/ foo.txt
+
+mnvgrepadd /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+mnvgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+mnvgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+lmnvgrep pa\%(tt\)ern   foo.txt
+lmnvgrep /pa\%(tt\)ern/ foo.txt
+
+lmnvgrep! pa\%(tt\)ern   foo.txt
+lmnvgrep! /pa\%(tt\)ern/ foo.txt
+
+lmnvgrep /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+lmnvgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+lmnvgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+lmnvgrepadd pa\%(tt\)ern   foo.txt
+lmnvgrepadd /pa\%(tt\)ern/ foo.txt
+
+lmnvgrepadd! pa\%(tt\)ern   foo.txt
+lmnvgrepadd! /pa\%(tt\)ern/ foo.txt
+
+lmnvgrepadd /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+lmnvgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+lmnvgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+
+" file args
+
+" multiple files
+mnvgrep pa\%(tt\)ern   foo.txt bar.txt
+mnvgrep /pa\%(tt\)ern/ foo.txt bar.txt
+
+" wildcard patterns
+mnvgrep pa\%(tt\)ern   **/*.txt
+mnvgrep /pa\%(tt\)ern/ **/*.txt
+
+" special filename characters
+mnvgrep pa\%(tt\)ern   %
+mnvgrep /pa\%(tt\)ern/ %
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_mzscheme.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_mzscheme.mnv
index 6844c49f76..1e2dd6c469 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_mzscheme.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mzscheme.mnv
@@ -1,7 +1,7 @@
-" Vim :mzscheme and :mzfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "m"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fm"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :mzscheme and :mzfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "m"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fm"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_normal.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_normal.mnv
index 6bd73982bc..7a58cb31ba 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_normal.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_normal.mnv
@@ -1,4 +1,4 @@
-" Vim :normal command
+" MNV :normal command
 
 
 normal j
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_perl.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_perl.mnv
index cccab1892b..a7eceedbc9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_perl.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_perl.mnv
@@ -1,7 +1,7 @@
-" Vim :perl and :perldo commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "p"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fp"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :perl and :perldo commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "p"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fp"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_profile.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_profile.mnv
index ba80aaab7f..38df8fced6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_profile.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_profile.mnv
@@ -1,4 +1,4 @@
-" Vim :profile and :profdel commands
+" MNV :profile and :profdel commands
 
 
 profile  start /tmp/myprofile
@@ -6,12 +6,12 @@ profile  stop
 profile  pause
 profile  continue
 profile  func MyFunc
-profile  file MyScript.vim 
-profile! file MyScript.vim
+profile  file MyScript.mnv 
+profile! file MyScript.mnv
 profile  dump
 
 profdel  func MyFunc
-profdel  file MyScript.vim
+profdel  file MyScript.mnv
 profdel  here
 
 
@@ -22,12 +22,12 @@ profile  stop                 " comment
 profile  pause                " comment
 profile  continue             " comment
 profile  func MyFunc          " comment
-profile  file MyScript.vim    " comment
-profile! file MyScript.vim    " comment
+profile  file MyScript.mnv    " comment
+profile! file MyScript.mnv    " comment
 profile  dump                 " comment
 
 profdel  func MyFunc          " comment
-profdel  file MyScript.vim    " comment
+profdel  file MyScript.mnv    " comment
 profdel  here                 " comment
 
 
@@ -38,11 +38,11 @@ profile  stop                 | echo "Foo"
 profile  pause                | echo "Foo"
 profile  continue             | echo "Foo"
 profile  func MyFunc          | echo "Foo"
-profile  file MyScript.vim    | echo "Foo"
-profile! file MyScript.vim    | echo "Foo"
+profile  file MyScript.mnv    | echo "Foo"
+profile! file MyScript.mnv    | echo "Foo"
 profile  dump                 | echo "Foo"
 
 profdel  func MyFunc          | echo "Foo"
-profdel  file MyScript.vim    | echo "Foo"
+profdel  file MyScript.mnv    | echo "Foo"
 profdel  here                 | echo "Foo"
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_prompt_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_prompt_commands.mnv
index 1f15313155..d02246add2 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_prompt_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_prompt_commands.mnv
@@ -1,4 +1,4 @@
-" Vim :prompt{find,repl} commands
+" MNV :prompt{find,repl} commands
 
 
 promptfind foo
@@ -22,7 +22,7 @@ promptfind foo " more search string
 promptfind foo | more search string
 
 
-def Vim9Context()
+def MNV9Context()
   promptfind foo
   promptrepl foo
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_python.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_python.mnv
index 8adc0e7ea7..4e92e9af3f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_python.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_python.mnv
@@ -1,9 +1,9 @@
-" Vim :python, :pydo and :pyfile commands
-" Vim :python3, :py3do and :py3file commands
-" Vim :pythonx, :pyxdo and :pyxfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "P"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fP"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :python, :pydo and :pyfile commands
+" MNV :python3, :py3do and :py3file commands
+" MNV :pythonx, :pyxdo and :pyxfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "P"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fP"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_range.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_range.mnv
index 88e7ad4715..88e7ad4715 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_range.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_range.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_redir.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_redir.mnv
index 2b5319aa57..1bc2c8a1b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_redir.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_redir.mnv
@@ -1,4 +1,4 @@
-" Vim :redir command
+" MNV :redir command
 
 
 redir  > filename
@@ -47,7 +47,7 @@ redir END
 
 " Issue #18319 (redir command not highlighted in some cases)
 
-def Vim9Context()
+def MNV9Context()
 
 var foo: string
 if true
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_ruby.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_ruby.mnv
index 32a39de46b..8a872640b9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_ruby.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_ruby.mnv
@@ -1,7 +1,7 @@
-" Vim :ruby, :rubydo and :rubyfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "r"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fr"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :ruby, :rubydo and :rubyfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "r"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fr"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_set.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_set.mnv
index 379f8065ea..3ce3efa3b9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_set.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_set.mnv
@@ -1,4 +1,4 @@
-" Vim :set command
+" MNV :set command
 
 
 set
@@ -18,7 +18,7 @@ set invallowrevins
 
 set aleph&
 set aleph&vi
-set aleph&vim
+set aleph&mnv
 
 set all&
 
@@ -118,7 +118,7 @@ set quoteescape=\
 echo "Foo"
 
 
-" Issue #16913 (vim syntax: set langmap may have wrong highlight)
+" Issue #16913 (mnv syntax: set langmap may have wrong highlight)
 
 set langmap+=ФЫВАПРОЛДЖЭЁ;ASDFGHJKL\\:\\"\\|
 set langmap+=ЯЧСМИТЬБЮ;ZXCVBNM<>
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_set_backslash.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_set_backslash.mnv
index 53851a7693..161e8b1230 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_set_backslash.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_set_backslash.mnv
@@ -1,8 +1,8 @@
-" Vim :set command (escaped characters)
-" VIM_TEST_SETUP hi link vimSetEscape      DiffAdd
-" VIM_TEST_SETUP hi link vimSetBarEscape   DiffDelete
-" VIM_TEST_SETUP hi link vimSetQuoteEscape DiffDelete
-" VIM_TEST_SETUP hi link vimSetEqual       DiffChange
+" MNV :set command (escaped characters)
+" MNV_TEST_SETUP hi link mnvSetEscape      DiffAdd
+" MNV_TEST_SETUP hi link mnvSetBarEscape   DiffDelete
+" MNV_TEST_SETUP hi link mnvSetQuoteEscape DiffDelete
+" MNV_TEST_SETUP hi link mnvSetEqual       DiffChange
 
 
 echo "-- 1 --"
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_sleep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_sleep.mnv
index 534550c503..ffc731caf9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_sleep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_sleep.mnv
@@ -1,4 +1,4 @@
-" Vim :sleep command
+" MNV :sleep command
 
 
 sleep	     " sleep for one second
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_sort.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_sort.mnv
index 97d030dfd3..b7160c89c6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_sort.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_sort.mnv
@@ -1,5 +1,5 @@
-" Vim :sort command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :sort command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 sort 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_substitute.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_substitute.mnv
index 983b39d044..a57d577c5d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_substitute.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_substitute.mnv
@@ -1,4 +1,4 @@
-" Vim :substitute command
+" MNV :substitute command
 
 
 substitute/foo/bar/&
@@ -50,7 +50,7 @@ s$/$//$ " comment
 s%/%//% " comment
 s&/&//& " comment
 s'/'//' " comment
-" FIXME - matches vimUserFunc
+" FIXME - matches mnvUserFunc
 " s(/(//( " comment
 s)/)//) " comment
 s*/*//* " comment
@@ -84,7 +84,7 @@ s $/$//$ " comment
 s %/%//% " comment
 s &/&//& " comment
 s '/'//' " comment
-" FIXME - matches vimUserFunc
+" FIXME - matches mnvUserFunc
 " s (/(//( " comment
 s )/)//) " comment
 s */*//* " comment
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_syntax.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_syntax.mnv
index 851931206c..4b9d81c1ac 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_syntax.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_syntax.mnv
@@ -1,5 +1,5 @@
-" Vim :syntax command
-" VIM_TEST_SETUP hi link vimGroupList Todo
+" MNV :syntax command
+" MNV_TEST_SETUP hi link mnvGroupList Todo
 
 
 " :syn-case
@@ -29,8 +29,8 @@ syntax foldlevel minimum
 
 " :syn-include
 
-syntax include @Foo <sfile>:p:h/foo.vim
-syntax include <sfile>:p:h/foo.vim
+syntax include @Foo <sfile>:p:h/foo.mnv
+syntax include <sfile>:p:h/foo.mnv
 
 " :syn-iskeyword
 
@@ -307,7 +307,7 @@ syn keyword testKeyword
 
 " leaking contained groups
 
-" Example: runtime/syntax/zsh.vim
+" Example: runtime/syntax/zsh.mnv
 "   "cluster" should not be highlighted outside of :syntax commands
 
 function! s:ContainedGroup()
@@ -319,7 +319,7 @@ function! s:ContainedGroup()
 endfunction
 
 
-" early termination of vimSynRegion
+" early termination of mnvSynRegion
 
 syn region testRegion
       "\ | does not end the args region
@@ -328,13 +328,13 @@ syn region testRegion
       \ end="end"
 
 
-" Issue #18491 (Two ")"s are incorrectly colored 'vimOperError' in syntax/mail.vim)
+" Issue #18491 (Two ")"s are incorrectly colored 'mnvOperError' in syntax/mail.mnv)
 
 syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" fold
 
 
 " Issue #19366 (highlight error for contains elements in a new line)
-" syntax/typst.vim
+" syntax/typst.mnv
 
 " Code {{{1
 syntax cluster typstCode
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_syntime.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_syntime.mnv
index b085480532..a2065d4c78 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_syntime.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_syntime.mnv
@@ -1,4 +1,4 @@
-" Vim :syntime command
+" MNV :syntime command
 
 
 syntime on
@@ -18,7 +18,7 @@ syntime report | echo "..."
 syntime report " comment
 
 
-def Vim9Context()
+def MNV9Context()
   syntime on
   syntime off
   syntime clear
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_lua.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_tcl.mnv
index 55d151e463..cda19e6fe5 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_lua.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_tcl.mnv
@@ -1,7 +1,7 @@
-" Vim :lua, :luado and :luafile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "l"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fl"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :tcl, :tcldo and :tclfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "t"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "ft"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_terminal.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_terminal.mnv
index 8fc6e04a11..289e2e51fb 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_terminal.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_terminal.mnv
@@ -1,5 +1,5 @@
-" Vim :terminal command
-" VIM_TEST_SETUP hi link vimTerminalCommand Todo
+" MNV :terminal command
+" MNV_TEST_SETUP hi link mnvTerminalCommand Todo
 
 
 terminal
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_throw.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_throw.mnv
index c64afc8d71..53b919d683 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_throw.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_throw.mnv
@@ -1,4 +1,4 @@
-" Vim :throw command
+" MNV :throw command
 
 
 " :help :throw
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_uniq.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_uniq.mnv
index d7aacc2b2e..3279449e06 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_uniq.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_uniq.mnv
@@ -1,5 +1,5 @@
-" Vim :uniq command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :uniq command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 uniq 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_wincmd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_wincmd.mnv
index 68fac3ae44..701f5bd0ff 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_wincmd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_wincmd.mnv
@@ -1,6 +1,6 @@
-" Vim :wincmd command
-" VIM_TEST_SETUP hi link vimWincmdArg Todo
-" VIM_TEST_SETUP hi link vimCmdSep Special
+" MNV :wincmd command
+" MNV_TEST_SETUP hi link mnvWincmdArg Todo
+" MNV_TEST_SETUP hi link mnvCmdSep Special
 
 
 wincmd s
@@ -55,7 +55,7 @@ wincmd s | echo "Foo"
 wincmd s " comment
 
 
-def Vim9Context()
+def MNV9Context()
   var wincmd = 42
   wincmd = 42
   :wincmd =
diff --git a/uvim/runtime/syntax/testdir/input/vim_expressions.vim b/uvim/runtime/syntax/testdir/input/mnv_expressions.mnv
index ae146c021e..ba4f7de153 100644
--- a/uvim/runtime/syntax/testdir/input/vim_expressions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_expressions.mnv
@@ -1,4 +1,4 @@
-" Vim expressions
+" MNV expressions
 
 
 " String
@@ -45,8 +45,8 @@ echo '''foo'
 echo 'foo'''
 echo 'foo''bar'
 
-" Unreported issue (incorrectly matches as vimString vimMark vimOper NONE)
-" https://github.com/tpope/vim-unimpaired/blob/6d44a6dc2ec34607c41ec78acf81657248580bf1/plugin/unimpaired.vim#L232
+" Unreported issue (incorrectly matches as mnvString mnvMark mnvOper NONE)
+" https://github.com/tpope/mnv-unimpaired/blob/6d44a6dc2ec34607c41ec78acf81657248580bf1/plugin/unimpaired.mnv#L232
 let cmd = 'put!=repeat(nr2char(10), v:count1)|silent '']+'
 
 
@@ -168,7 +168,7 @@ echo [1,
       \]
 echo [1, 'two', 1 + 2, "fo" .. "ur"]
 
-" Issue #5830 (Incorrect syntax highlighting in Vim script when omitting space in list of string)
+" Issue #5830 (Incorrect syntax highlighting in MNV script when omitting space in list of string)
 let l = ['a','b','c']
 
 " Dictionary
@@ -370,7 +370,7 @@ echo expr !~?    expr
 echo expr is?    expr
 echo expr isnot? expr
 
-" Unreported issue ("is" incorrectly matches as "echo vimNumber *vimCommand* vimNumber")
+" Unreported issue ("is" incorrectly matches as "echo mnvNumber *mnvCommand* mnvNumber")
 echo 42 is 42
 
 " Line continuation
@@ -399,12 +399,12 @@ let foo = foo +
 call Foo(v:true, v:false, v:null)
 
 
-" Issue #16221 (vimString becomes vimVar when preceded by !)
+" Issue #16221 (mnvString becomes mnvVar when preceded by !)
 
 let bar = !'g:bar'->exists()
 
 
-" Issue #14423 (vim.vim: Opt out of vimSearch*)
+" Issue #14423 (mnv.mnv: Opt out of mnvSearch*)
 
 ?truthy
 let truthy = 0
diff --git a/uvim/runtime/syntax/testdir/input/vim_function_calls.vim b/uvim/runtime/syntax/testdir/input/mnv_function_calls.mnv
index 60158161c4..aa563d1c7a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_function_calls.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_function_calls.mnv
@@ -1,5 +1,5 @@
-" Vim function calls
-" VIM_TEST_SETUP hi link vimUserFunc Todo
+" MNV function calls
+" MNV_TEST_SETUP hi link mnvUserFunc Todo
 
 
 call abs(42)
@@ -132,7 +132,7 @@ swapname (42)
 
 let type = type(42)
 call type(42)
-" Vim9 command
+" MNV9 command
 " type(42)
 " type (42)
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_function_variables.vim b/uvim/runtime/syntax/testdir/input/mnv_function_variables.mnv
index 5322604fec..adf2d26f58 100644
--- a/uvim/runtime/syntax/testdir/input/vim_function_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_function_variables.mnv
@@ -1,4 +1,4 @@
-" Vim function variable highlighting
+" MNV function variable highlighting
 
 
 function Foo()
@@ -402,7 +402,7 @@ for k in keys(s:) | echo s:[k] | endfor
 for k in keys(a:) | echo a:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-" Neovim-specific variables (not highlighted by default)
+" Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_key_notation.vim b/uvim/runtime/syntax/testdir/input/mnv_key_notation.mnv
index 5730e62bf6..5730e62bf6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_key_notation.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_key_notation.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_lambdas.vim b/uvim/runtime/syntax/testdir/input/mnv_lambdas.mnv
index 5503e3fb32..a26530f63e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_lambdas.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_lambdas.mnv
@@ -1,7 +1,7 @@
-" Vim lambda expressions
-" VIM_TEST_SETUP hi link vimLambdaOperator Todo
-" VIM_TEST_SETUP hi link vimLambdaBrace Todo
-" VIM_TEST_SETUP hi link vimFuncParam Identifier
+" MNV lambda expressions
+" MNV_TEST_SETUP hi link mnvLambdaOperator Todo
+" MNV_TEST_SETUP hi link mnvLambdaBrace Todo
+" MNV_TEST_SETUP hi link mnvFuncParam Identifier
 
 
 let expr = 42
@@ -128,7 +128,7 @@ let Foo = {-> {-> #{
 		\ {'repeat': 3})
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (string immediately after -> operator)
 
 let [func, _func_] = [{->"func"}(), 'func']
diff --git a/uvim/runtime/syntax/testdir/input/vim_line_continuation.vim b/uvim/runtime/syntax/testdir/input/mnv_line_continuation.mnv
index b7a004b49b..cd092f56b6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_line_continuation.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_line_continuation.mnv
@@ -1,4 +1,4 @@
-" Vim line continuations with interspersed comments
+" MNV line continuations with interspersed comments
 
 
 function Foo(
diff --git a/uvim/runtime/syntax/testdir/input/vim_new.vim b/uvim/runtime/syntax/testdir/input/mnv_new.mnv
index e7e18142bf..979446a0c4 100644
--- a/uvim/runtime/syntax/testdir/input/vim_new.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_new.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim :new command and class constructors
-# TODO: move to vim9_constructor and create new vim_ex_new and vim9_ex_new
+mnv9script
+# MNV :new command and class constructors
+# TODO: move to mnv9_constructor and create new mnv_ex_new and mnv9_ex_new
 #       tests
 
 
diff --git a/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv b/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv
new file mode 100644
index 0000000000..1ccf1e4d04
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv
@@ -0,0 +1,229 @@
+" Neomnv-specific highlighting
+" MNV_TEST_SETUP let g:mnvsyn_mnv_features = ["nmnv"]
+
+
+echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
+
+
+echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback
+echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar
+echo &winblend &winhighlight
+
+
+call api_info()
+call buffer_exists()
+call buffer_name()
+call buffer_number()
+call chanclose()
+call chansend()
+call ctxget()
+call ctxpop()
+call ctxpush()
+call ctxset()
+call ctxsize()
+call dictwatcheradd()
+call dictwatcherdel()
+call file_readable()
+call highlight_exists()
+call highlightID()
+call jobclose()
+call jobpid()
+call jobresize()
+call jobsend()
+call jobstart()
+call jobstop()
+call jobwait()
+call last_buffer_nr()
+call menu_get()
+call msgpackdump()
+call msgpackparse()
+call reg_recorded()
+call rpcnotify()
+call rpcrequest()
+call rpcstart()
+call rpcstop()
+call serverstart()
+call serverstop()
+call sockconnect()
+call stdioopen()
+call stdpath()
+call termopen()
+call test_write_list_log()
+call wait()
+
+call nmnv_buf_add_highlight()
+call nmnv_buf_attach()
+call nmnv_buf_clear_highlight()
+call nmnv_buf_clear_namespace()
+call nmnv_buf_create_user_command()
+call nmnv__buf_debug_extmarks()
+call nmnv_buf_delete()
+call nmnv_buf_del_extmark()
+call nmnv_buf_del_keymap()
+call nmnv_buf_del_mark()
+call nmnv_buf_del_user_command()
+call nmnv_buf_del_var()
+call nmnv_buf_get_changedtick()
+call nmnv_buf_get_commands()
+call nmnv_buf_get_extmark_by_id()
+call nmnv_buf_get_extmarks()
+call nmnv_buf_get_keymap()
+call nmnv_buf_get_lines()
+call nmnv_buf_get_mark()
+call nmnv_buf_get_name()
+call nmnv_buf_get_number()
+call nmnv_buf_get_offset()
+call nmnv_buf_get_option()
+call nmnv_buf_get_text()
+call nmnv_buf_get_var()
+call nmnv_buf_is_loaded()
+call nmnv_buf_is_valid()
+call nmnv_buf_line_count()
+call nmnv_buf_set_extmark()
+call nmnv_buf_set_keymap()
+call nmnv_buf_set_lines()
+call nmnv_buf_set_mark()
+call nmnv_buf_set_name()
+call nmnv_buf_set_option()
+call nmnv_buf_set_text()
+call nmnv_buf_set_var()
+call nmnv_buf_set_virtual_text()
+call nmnv__buf_stats()
+call nmnv_call_dict_function()
+call nmnv_call_function()
+call nmnv_clear_autocmds()
+call nmnv_cmd()
+call nmnv_command()
+call nmnv_command_output()
+call nmnv__complete_set()
+call nmnv_create_augroup()
+call nmnv_create_autocmd()
+call nmnv_create_buf()
+call nmnv_create_namespace()
+call nmnv_create_user_command()
+call nmnv_del_augroup_by_id()
+call nmnv_del_augroup_by_name()
+call nmnv_del_autocmd()
+call nmnv_del_current_line()
+call nmnv_del_keymap()
+call nmnv_del_mark()
+call nmnv_del_user_command()
+call nmnv_del_var()
+call nmnv_echo()
+call nmnv_err_write()
+call nmnv_err_writeln()
+call nmnv_eval()
+call nmnv_eval_statusline()
+call nmnv_exec()
+call nmnv_exec2()
+call nmnv_exec_autocmds()
+call nmnv_feedkeys()
+call nmnv_get_all_options_info()
+call nmnv_get_autocmds()
+call nmnv_get_chan_info()
+call nmnv_get_color_by_name()
+call nmnv_get_color_map()
+call nmnv_get_commands()
+call nmnv_get_context()
+call nmnv_get_current_buf()
+call nmnv_get_current_line()
+call nmnv_get_current_tabpage()
+call nmnv_get_current_win()
+call nmnv_get_hl()
+call nmnv_get_hl_by_id()
+call nmnv_get_hl_by_name()
+call nmnv_get_hl_id_by_name()
+call nmnv_get_hl_ns()
+call nmnv_get_keymap()
+call nmnv__get_lib_dir()
+call nmnv_get_mark()
+call nmnv_get_mode()
+call nmnv_get_namespaces()
+call nmnv_get_option()
+call nmnv_get_option_info()
+call nmnv_get_option_info2()
+call nmnv_get_option_value()
+call nmnv_get_proc()
+call nmnv_get_proc_children()
+call nmnv__get_runtime()
+call nmnv_get_runtime_file()
+call nmnv_get_var()
+call nmnv_get_vvar()
+call nmnv__id()
+call nmnv__id_array()
+call nmnv__id_dict()
+call nmnv__id_float()
+call nmnv_input()
+call nmnv_input_mouse()
+call nmnv__inspect_cell()
+call nmnv__invalidate_glyph_cache()
+call nmnv_list_bufs()
+call nmnv_list_chans()
+call nmnv_list_runtime_paths()
+call nmnv_list_tabpages()
+call nmnv_list_uis()
+call nmnv_list_wins()
+call nmnv_load_context()
+call nmnv_notify()
+call nmnv__ns_get()
+call nmnv__ns_set()
+call nmnv_open_term()
+call nmnv_open_win()
+call nmnv_out_write()
+call nmnv_parse_cmd()
+call nmnv_parse_expression()
+call nmnv_paste()
+call nmnv_put()
+call nmnv__redraw()
+call nmnv_replace_termcodes()
+call nmnv__runtime_inspect()
+call nmnv__screenshot()
+call nmnv_select_popupmenu_item()
+call nmnv_set_current_buf()
+call nmnv_set_current_dir()
+call nmnv_set_current_line()
+call nmnv_set_current_tabpage()
+call nmnv_set_current_win()
+call nmnv_set_hl()
+call nmnv_set_hl_ns()
+call nmnv_set_hl_ns_fast()
+call nmnv_set_keymap()
+call nmnv_set_option()
+call nmnv_set_option_value()
+call nmnv_set_var()
+call nmnv_set_vvar()
+call nmnv__stats()
+call nmnv_strwidth()
+call nmnv_tabpage_del_var()
+call nmnv_tabpage_get_number()
+call nmnv_tabpage_get_var()
+call nmnv_tabpage_get_win()
+call nmnv_tabpage_is_valid()
+call nmnv_tabpage_list_wins()
+call nmnv_tabpage_set_var()
+call nmnv_tabpage_set_win()
+call nmnv__unpack()
+call nmnv_win_close()
+call nmnv_win_del_var()
+call nmnv_win_get_buf()
+call nmnv_win_get_config()
+call nmnv_win_get_cursor()
+call nmnv_win_get_height()
+call nmnv_win_get_number()
+call nmnv_win_get_option()
+call nmnv_win_get_position()
+call nmnv_win_get_tabpage()
+call nmnv_win_get_var()
+call nmnv_win_get_width()
+call nmnv_win_hide()
+call nmnv_win_is_valid()
+call nmnv_win_set_buf()
+call nmnv_win_set_config()
+call nmnv_win_set_cursor()
+call nmnv_win_set_height()
+call nmnv_win_set_hl_ns()
+call nmnv_win_set_option()
+call nmnv_win_set_var()
+call nmnv_win_set_width()
+call nmnv_win_text_height()
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_no_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv_no_comment_strings.mnv
index 3a28ab101a..87da706e26 100644
--- a/uvim/runtime/syntax/testdir/input/vim_no_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_no_comment_strings.mnv
@@ -1,5 +1,5 @@
-" Vim comment strings
-" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
+" MNV comment strings
+" MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:false
 
 
 " pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim_predefined_user_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_predefined_user_commands.mnv
index 8b178909a1..ac0d0a3fc7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_predefined_user_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_predefined_user_commands.mnv
@@ -1,4 +1,4 @@
-" Vim predefined user commands
+" MNV predefined user commands
 
 
 " :CompilerSet - runtime/compiler/
@@ -8,7 +8,7 @@ CompilerSet errorformat=\ %#[%.%#]\ %#%f:%l:%v:%*\\d:%*\\d:\ %t%[%^:]%#:%m,
     \%A\ %#[%.%#]\ %f:%l:\ %m,%-Z\ %#[%.%#]\ %p^,%C\ %#[%.%#]\ %#%m
 
 
-" :SynMenu - runtime/makemenu.vim
+" :SynMenu - runtime/makemenu.mnv
 
 SynMenu AB.A2ps\ config:a2ps
 SynMenu AB.Aap:aap
diff --git a/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv b/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv
new file mode 100644
index 0000000000..8f08db98b6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv
@@ -0,0 +1,5 @@
+#!/usr/bin/env mnv -S
+" MNV shebang line
+
+
+#!/usr/bin/env mnv -S
diff --git a/uvim/runtime/syntax/testdir/input/vim_variables.vim b/uvim/runtime/syntax/testdir/input/mnv_variables.mnv
index d062efbb03..03a169dde2 100644
--- a/uvim/runtime/syntax/testdir/input/vim_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_variables.mnv
@@ -1,4 +1,4 @@
-" Vim variable highlighting
+" MNV variable highlighting
 
 
 " :let
@@ -401,7 +401,7 @@ for k in keys(s:) | echo s:[k] | endfor
 for k in keys(a:) | echo a:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-" Neovim-specific variables (not highlighted by default)
+" Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/modula2_iso.def b/uvim/runtime/syntax/testdir/input/modula2_iso.def
index b979ccf70c..356a31c1ca 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_iso.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_iso.def
@@ -1,8 +1,8 @@
-(* Modula-2 ISO Test File for Vim Syntax Colouring *)
+(* Modula-2 ISO Test File for MNV Syntax Colouring *)
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 
diff --git a/uvim/runtime/syntax/testdir/input/modula2_pim.def b/uvim/runtime/syntax/testdir/input/modula2_pim.def
index e008160d34..4042e3c086 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_pim.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_pim.def
@@ -1,8 +1,8 @@
-(* Modula-2 PIM Test File for Vim Syntax Colouring *)
+(* Modula-2 PIM Test File for MNV Syntax Colouring *)
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 DEFINITION MODULE Foobar; (*!m2pim*)
diff --git a/uvim/runtime/syntax/testdir/input/modula2_r10.def b/uvim/runtime/syntax/testdir/input/modula2_r10.def
index 0872d5dfb9..6c75c40b7b 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_r10.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_r10.def
@@ -1,8 +1,8 @@
-(* Modula-2 R10 Test File for Vim Syntax Colouring *) 
+(* Modula-2 R10 Test File for MNV Syntax Colouring *) 
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 DEFINITION MODULE Foobar; (*!m2r10*)
diff --git a/uvim/runtime/syntax/testdir/input/progress_comments.p b/uvim/runtime/syntax/testdir/input/progress_comments.p
index dd831fe8c5..053f8a4405 100644
--- a/uvim/runtime/syntax/testdir/input/progress_comments.p
+++ b/uvim/runtime/syntax/testdir/input/progress_comments.p
@@ -1,5 +1,5 @@
 /*
- * VIM_TEST_SETUP set filetype=progress
+ * MNV_TEST_SETUP set filetype=progress
  */
 
 define variable customer_name as character no-undo.
diff --git a/uvim/runtime/syntax/testdir/input/python2_strings.py b/uvim/runtime/syntax/testdir/input/python2_strings.py
index a5625b7d65..3a68742787 100644
--- a/uvim/runtime/syntax/testdir/input/python2_strings.py
+++ b/uvim/runtime/syntax/testdir/input/python2_strings.py
@@ -79,4 +79,4 @@ test = UR"""Raw Unicode string with quotes ' and "
 and literal \t and \040 and \xFF
 and escapes \u00A1 and \U00010605"""
 
-# vim: syntax=python2
+# mnv: syntax=python2
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py b/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
index d55e656328..075feb2211 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP unlet g:python_constant_highlight
-# VIM_TEST_SETUP unlet g:python_no_builtin_highlight
+# MNV_TEST_SETUP unlet g:python_constant_highlight
+# MNV_TEST_SETUP unlet g:python_no_builtin_highlight
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py b/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
index e092b186e4..6a6d5d60e5 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP let g:python_constant_highlight = 1
-# VIM_TEST_SETUP unlet g:python_no_builtin_highlight
+# MNV_TEST_SETUP let g:python_constant_highlight = 1
+# MNV_TEST_SETUP unlet g:python_no_builtin_highlight
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py b/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
index 7b3d9c9c63..5bd43e5a0e 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP unlet g:python_constant_highlight
-# VIM_TEST_SETUP let g:python_no_builtin_highlight = 1
+# MNV_TEST_SETUP unlet g:python_constant_highlight
+# MNV_TEST_SETUP let g:python_no_builtin_highlight = 1
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py b/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
index 60f3fb227d..86e4892cdf 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP let g:python_constant_highlight = 1
-# VIM_TEST_SETUP let g:python_no_builtin_highlight = 1
+# MNV_TEST_SETUP let g:python_constant_highlight = 1
+# MNV_TEST_SETUP let g:python_no_builtin_highlight = 1
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/selftestdir/README.txt b/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
index ec4cacb1a7..dea112ad5c 100644
--- a/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
+++ b/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
@@ -1,6 +1,6 @@
 The test files with made-up syntax in this directory serve for additional
 linewise checks to be manually performed whenever the algorithm managing
-screen dump file generation is modified (../../runtest.vim#RunTest()).
+screen dump file generation is modified (../../runtest.mnv#RunTest()).
 
 This is mainly used for debugging and testing the syntax test suite.
 
diff --git a/uvim/runtime/syntax/testdir/input/setup/help.vim b/uvim/runtime/syntax/testdir/input/setup/help.mnv
index 038175adaa..038175adaa 100644
--- a/uvim/runtime/syntax/testdir/input/setup/help.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/help.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/help_ex_version.vim b/uvim/runtime/syntax/testdir/input/setup/help_ex_version.mnv
index 22953b8c45..22953b8c45 100644
--- a/uvim/runtime/syntax/testdir/input/setup/help_ex_version.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/help_ex_version.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.vim b/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.mnv
index e8daae0e74..e8daae0e74 100644
--- a/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/java_module_info.vim b/uvim/runtime/syntax/testdir/input/setup/java_module_info.mnv
index 2711c1a9a0..6d3d634a4d 100644
--- a/uvim/runtime/syntax/testdir/input/setup/java_module_info.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/java_module_info.mnv
@@ -1,4 +1,4 @@
-vim9script
+mnv9script
 
 # Test filenames are required to begin with the filetype name prefix,
 # whereas the name of a Java module declaration must be "module-info".
diff --git a/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.vim b/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.mnv
index a0b2d985a3..a0b2d985a3 100644
--- a/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.vim b/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.mnv
index a1585b18bb..a1585b18bb 100644
--- a/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv
new file mode 100644
index 0000000000..e6aa760ca5
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv
new file mode 100644
index 0000000000..7d027095ca
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvRedirFile String
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim
deleted file mode 100644
index 3a0ec2dae5..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim
deleted file mode 100644
index 6193cc4e58..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimRedirFile String
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim b/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim b/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim b/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/sh_09.sh b/uvim/runtime/syntax/testdir/input/sh_09.sh
index ad22bfb400..c999d624af 100644
--- a/uvim/runtime/syntax/testdir/input/sh_09.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_09.sh
@@ -1,5 +1,5 @@
 #!/bin/dash
-# Test file for vim the check () subshells
+# Test file for mnv the check () subshells
 ( cd ; $pwd ) | wc -c
 ( cd $1 ; $pwd ) | wc -c
 ( cd ${1} ; $pwd ) | wc -c
diff --git a/uvim/runtime/syntax/testdir/input/sh_12.sh b/uvim/runtime/syntax/testdir/input/sh_12.sh
index dcfa553547..b3d43b6d29 100644
--- a/uvim/runtime/syntax/testdir/input/sh_12.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_12.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-# VIM_TEST_SETUP highlight link shArrayValue Identifier
-# VIM_TEST_SETUP highlight link shBracketExprDelim Structure
-# VIM_TEST_SETUP highlight link shCharClass Todo
-# VIM_TEST_SETUP highlight link shRange CursorLine
+# MNV_TEST_SETUP highlight link shArrayValue Identifier
+# MNV_TEST_SETUP highlight link shBracketExprDelim Structure
+# MNV_TEST_SETUP highlight link shCharClass Todo
+# MNV_TEST_SETUP highlight link shRange CursorLine
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/sh_13.sh b/uvim/runtime/syntax/testdir/input/sh_13.sh
index 18fd0d1335..b959e0e399 100644
--- a/uvim/runtime/syntax/testdir/input/sh_13.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_13.sh
@@ -1,6 +1,6 @@
 #!/bin/dash
 # Issue #17026 (bash highlighting requires space after $())
-# https://github.com/vim/vim/issues/17026#issuecomment-2774112284
+# https://github.com/Project-Tick/Project-Tick/issues/17026#issuecomment-2774112284
 
 _comp_compgen_split -l -- "$(
     tmux list-commands -F "#{command_list_name}"
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh b/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
index 161f14f978..1c56592376 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh b/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
index 15b133ab92..e6be9260c7 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
@@ -1,6 +1,6 @@
 #!/bin/dash
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 thence()
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh b/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
index 0a1b21edeb..14a99f0e68 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh2020
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i 10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh b/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
index d2eae00f89..030a5fa59c 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh88
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i 10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh b/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
index 04b56bb5a2..2eba028344 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
@@ -1,6 +1,6 @@
 #!/bin/mksh
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc b/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
index a33e9c3dde..60911562c9 100644
--- a/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
+++ b/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
@@ -101,4 +101,4 @@ super - z : echo "super is cmd alias"
 
 # End of configuration
 
-# vim:ft=skhd:
+# mnv:ft=skhd:
diff --git a/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers b/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
index 770e8955a6..0c7faf4ca9 100644
--- a/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
+++ b/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
@@ -1,7 +1,7 @@
 # vi:ft=sudoers
 Host_Alias NODES = ! node0, 192.168.10.1
 User_Alias ADMIN = alice, bob
-Cmnd_Alias VIM = /usr/bin/vim, sha224:d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f /usr/bin/view, sha256:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= /usr/bin/vimdiff
+Cmnd_Alias MNV = /usr/bin/mnv, sha224:d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f /usr/bin/view, sha256:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= /usr/bin/mnvdiff
 Runas_Alias ROOT = charlie, dave
 
 # Boolean Flags
@@ -11,7 +11,7 @@ Defaults@!node0, !node1 !! env_reset
 Defaults@10.0.0.1 , !172.16.0.1/12, !!192.168.0.1/255.255.0.0 !! fqdn
 Defaults:ALL, ADMIN ignore_dot
 Defaults:user0, #1000, %group0, %#1000 mail_all_cmnds
-Defaults!ALL,VIM noexec
+Defaults!ALL,MNV noexec
 Defaults!list,sudoedit !path_info
 Defaults! /bin/ls requiretty
 Defaults!!/bin/less , /bin/more set_home
@@ -24,7 +24,7 @@ Defaults:ALL passwd_tries = 3, passwd_timeout = 2.5, umask = 0027
 Defaults@ALL ! passwd_timeout , !!! umask
 
 # Strings
-Defaults editor = "/usr/bin/vim:/bin/vi"
+Defaults editor = "/usr/bin/mnv:/bin/vi"
 Defaults secure_path = /usr/sbin\:/usr/bin
 Defaults>ALL syslog_badpri=alert,syslog_goodpri=notice
 
diff --git a/uvim/runtime/syntax/testdir/input/tcsh.tcsh b/uvim/runtime/syntax/testdir/input/tcsh.tcsh
index 332b626e52..1dfc1fd296 100644
--- a/uvim/runtime/syntax/testdir/input/tcsh.tcsh
+++ b/uvim/runtime/syntax/testdir/input/tcsh.tcsh
@@ -1,4 +1,4 @@
-# https://github.com/vim/vim/pull/19172#issuecomment-3751574224
+# https://github.com/Project-Tick/Project-Tick/pull/19172#issuecomment-3751574224
 
 set script_dir="" #comment
 set script_dir=""
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim b/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim
deleted file mode 100644
index bedd5bbda7..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim
+++ /dev/null
@@ -1,120 +0,0 @@
-vim9script
-# Vim9 :import command
-# VIM_TEST_SETUP hi link vimImportName Todo
-
-
-import "foo.vim"
-import true ? "foo.vim" : "bar.vim"
-
-import true ?
-  "foo.vim" :
-  "bar.vim"
-
-import true
-  ? "foo.vim"
-  : "bar.vim"
-
-import true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-
-import true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-
-import "foo.vim" as bar
-import true ? "foo.vim" : "bar.vim" as baz
-
-import true ?
-  "foo.vim" :
-  "bar.vim"
-  as baz
-
-import true
-  ? "foo.vim"
-  : "bar.vim"
-  as baz
-
-import true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-  # comment
-  as baz
-
-import true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-  # comment
-  as baz
-
-echo "Foo" | import "foo.vim"
-
-
-# autoload
-
-import autoload "foo.vim"
-import autoload true ? "foo.vim" : "bar.vim"
-
-import autoload true ?
-  "foo.vim" :
-  "bar.vim"
-
-import autoload true
-  ? "foo.vim"
-  : "bar.vim"
-
-import autoload true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-
-import autoload true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-
-import autoload "foo.vim" as bar
-import autoload true ? "foo.vim" : "bar.vim" as baz
-
-import autoload true ?
-  "foo.vim" :
-  "bar.vim"
-  as baz
-
-import autoload true
-  ? "foo.vim"
-  : "bar.vim"
-  as baz
-
-import autoload true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-  # comment
-  as baz
-
-import autoload true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-  # comment
-  as baz
-
-
-# "as" keyword in expr
-
-var as = "modules/"
-import true ? as .. "foo.vim" : as .. "bar.vim" as other
-
diff --git a/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim b/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
deleted file mode 100644
index db48abd967..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" Vim9 legacy script header
-" VIM_TEST_SETUP let g:vimsyn_folding = "H"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-
-
-" comment
-
-if !has('vim9script')
-  # 42 " comment
-  source foo.vim
-  finish
-endif
-
-" comment
-
-vim9script noclear
-
-# comment
-
- # string only recognised with leading char
- "useless string"
-
diff --git a/uvim/runtime/syntax/testdir/input/vim9_shebang.vim b/uvim/runtime/syntax/testdir/input/vim9_shebang.vim
deleted file mode 100644
index bd5ca914fc..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_shebang.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env vim -S
-vim9script
-# Vim9 shebang line
-
-
-# just a line comment
-#!/usr/bin/env vim -S
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim b/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim
deleted file mode 100644
index f7fad2672f..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Vim :catch command
-
-
-" :help :catch
-
-catch /^Vim:Interrupt$/		" catch interrupts (CTRL-C)
-catch /^Vim\%((\a\+)\)\=:E/	" catch all Vim errors
-catch /^Vim\%((\a\+)\)\=:/	" catch errors and interrupts
-catch /^Vim(write):/		" catch all errors in :write
-catch /^Vim\%((\a\+)\)\=:E123:/	" catch error E123
-catch /my-exception/		" catch user exception
-catch /.*/			" catch everything
-catch				" same as /.*/
-
-" :help :try
-
-try | sleep 100 | catch /^Vim:Interrupt$/ | endtry
-try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_import.vim b/uvim/runtime/syntax/testdir/input/vim_ex_import.vim
deleted file mode 100644
index 07df827b9e..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_import.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" Vim :import command
-" VIM_TEST_SETUP hi link vimImportName Todo
-
-
-import "foo.vim"
-impor v:true ? "foo.vim" : "bar.vim"
-
-import v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-
-import v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-
-import v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-
-import v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-
-import "foo.vim" as bar
-import v:true ? "foo.vim" : "bar.vim" as baz
-
-import v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-      \ as baz
-
-import v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-      \ as baz
-
-import v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-      "\ comment
-      \ as baz
-
-import v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-      "\ comment
-      \ as baz
-
-echo "Foo" | import "foo.vim"
-
-
-" autoload
-
-import autoload "foo.vim"
-import autoload v:true ? "foo.vim" : "bar.vim"
-
-import autoload v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-
-import autoload v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-
-import autoload v:true ?
-      "\ comment 
-      \"foo.vim" :
-      "\ comment
-      \ "bar.vim"
-
-import autoload v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-
-import autoload "foo.vim" as bar
-import autoload v:true ? "foo.vim" : "bar.vim" as baz
-
-import autoload v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-      \ as baz
-
-import autoload v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-      \ as baz
-
-import autoload v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-      "\ comment
-      \ as baz
-
-import autoload v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-      "\ comment
-      \ as baz
-
-
-" "as" keyword in expr
-
-let as = "modules/"
-import v:true ? as .. "foo.vim" : as .. "bar.vim" as other
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim b/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
deleted file mode 100644
index b7688a014e..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim :*vimgrep and :*vimgrepadd commands
-" VIM_TEST_SETUP hi link vimVimgrepFile Todo
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimVimgrepBarEscape Special
-
-
-vimgrep pa\%(tt\)ern   foo.txt
-vimgrep /pa\%(tt\)ern/ foo.txt
-
-vimgrep! pa\%(tt\)ern   foo.txt
-vimgrep! /pa\%(tt\)ern/ foo.txt
-
-vimgrep /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-vimgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-vimgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-vimgrepadd pa\%(tt\)ern   foo.txt
-vimgrepadd /pa\%(tt\)ern/ foo.txt
-
-vimgrepadd! pa\%(tt\)ern   foo.txt
-vimgrepadd! /pa\%(tt\)ern/ foo.txt
-
-vimgrepadd /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-vimgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-vimgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-lvimgrep pa\%(tt\)ern   foo.txt
-lvimgrep /pa\%(tt\)ern/ foo.txt
-
-lvimgrep! pa\%(tt\)ern   foo.txt
-lvimgrep! /pa\%(tt\)ern/ foo.txt
-
-lvimgrep /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-lvimgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-lvimgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-lvimgrepadd pa\%(tt\)ern   foo.txt
-lvimgrepadd /pa\%(tt\)ern/ foo.txt
-
-lvimgrepadd! pa\%(tt\)ern   foo.txt
-lvimgrepadd! /pa\%(tt\)ern/ foo.txt
-
-lvimgrepadd /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-lvimgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-lvimgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-
-" file args
-
-" multiple files
-vimgrep pa\%(tt\)ern   foo.txt bar.txt
-vimgrep /pa\%(tt\)ern/ foo.txt bar.txt
-
-" wildcard patterns
-vimgrep pa\%(tt\)ern   **/*.txt
-vimgrep /pa\%(tt\)ern/ **/*.txt
-
-" special filename characters
-vimgrep pa\%(tt\)ern   %
-vimgrep /pa\%(tt\)ern/ %
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim b/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim
deleted file mode 100644
index b1b477ed01..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim
+++ /dev/null
@@ -1,229 +0,0 @@
-" Neovim-specific highlighting
-" VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"]
-
-
-echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
-
-
-echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback
-echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar
-echo &winblend &winhighlight
-
-
-call api_info()
-call buffer_exists()
-call buffer_name()
-call buffer_number()
-call chanclose()
-call chansend()
-call ctxget()
-call ctxpop()
-call ctxpush()
-call ctxset()
-call ctxsize()
-call dictwatcheradd()
-call dictwatcherdel()
-call file_readable()
-call highlight_exists()
-call highlightID()
-call jobclose()
-call jobpid()
-call jobresize()
-call jobsend()
-call jobstart()
-call jobstop()
-call jobwait()
-call last_buffer_nr()
-call menu_get()
-call msgpackdump()
-call msgpackparse()
-call reg_recorded()
-call rpcnotify()
-call rpcrequest()
-call rpcstart()
-call rpcstop()
-call serverstart()
-call serverstop()
-call sockconnect()
-call stdioopen()
-call stdpath()
-call termopen()
-call test_write_list_log()
-call wait()
-
-call nvim_buf_add_highlight()
-call nvim_buf_attach()
-call nvim_buf_clear_highlight()
-call nvim_buf_clear_namespace()
-call nvim_buf_create_user_command()
-call nvim__buf_debug_extmarks()
-call nvim_buf_delete()
-call nvim_buf_del_extmark()
-call nvim_buf_del_keymap()
-call nvim_buf_del_mark()
-call nvim_buf_del_user_command()
-call nvim_buf_del_var()
-call nvim_buf_get_changedtick()
-call nvim_buf_get_commands()
-call nvim_buf_get_extmark_by_id()
-call nvim_buf_get_extmarks()
-call nvim_buf_get_keymap()
-call nvim_buf_get_lines()
-call nvim_buf_get_mark()
-call nvim_buf_get_name()
-call nvim_buf_get_number()
-call nvim_buf_get_offset()
-call nvim_buf_get_option()
-call nvim_buf_get_text()
-call nvim_buf_get_var()
-call nvim_buf_is_loaded()
-call nvim_buf_is_valid()
-call nvim_buf_line_count()
-call nvim_buf_set_extmark()
-call nvim_buf_set_keymap()
-call nvim_buf_set_lines()
-call nvim_buf_set_mark()
-call nvim_buf_set_name()
-call nvim_buf_set_option()
-call nvim_buf_set_text()
-call nvim_buf_set_var()
-call nvim_buf_set_virtual_text()
-call nvim__buf_stats()
-call nvim_call_dict_function()
-call nvim_call_function()
-call nvim_clear_autocmds()
-call nvim_cmd()
-call nvim_command()
-call nvim_command_output()
-call nvim__complete_set()
-call nvim_create_augroup()
-call nvim_create_autocmd()
-call nvim_create_buf()
-call nvim_create_namespace()
-call nvim_create_user_command()
-call nvim_del_augroup_by_id()
-call nvim_del_augroup_by_name()
-call nvim_del_autocmd()
-call nvim_del_current_line()
-call nvim_del_keymap()
-call nvim_del_mark()
-call nvim_del_user_command()
-call nvim_del_var()
-call nvim_echo()
-call nvim_err_write()
-call nvim_err_writeln()
-call nvim_eval()
-call nvim_eval_statusline()
-call nvim_exec()
-call nvim_exec2()
-call nvim_exec_autocmds()
-call nvim_feedkeys()
-call nvim_get_all_options_info()
-call nvim_get_autocmds()
-call nvim_get_chan_info()
-call nvim_get_color_by_name()
-call nvim_get_color_map()
-call nvim_get_commands()
-call nvim_get_context()
-call nvim_get_current_buf()
-call nvim_get_current_line()
-call nvim_get_current_tabpage()
-call nvim_get_current_win()
-call nvim_get_hl()
-call nvim_get_hl_by_id()
-call nvim_get_hl_by_name()
-call nvim_get_hl_id_by_name()
-call nvim_get_hl_ns()
-call nvim_get_keymap()
-call nvim__get_lib_dir()
-call nvim_get_mark()
-call nvim_get_mode()
-call nvim_get_namespaces()
-call nvim_get_option()
-call nvim_get_option_info()
-call nvim_get_option_info2()
-call nvim_get_option_value()
-call nvim_get_proc()
-call nvim_get_proc_children()
-call nvim__get_runtime()
-call nvim_get_runtime_file()
-call nvim_get_var()
-call nvim_get_vvar()
-call nvim__id()
-call nvim__id_array()
-call nvim__id_dict()
-call nvim__id_float()
-call nvim_input()
-call nvim_input_mouse()
-call nvim__inspect_cell()
-call nvim__invalidate_glyph_cache()
-call nvim_list_bufs()
-call nvim_list_chans()
-call nvim_list_runtime_paths()
-call nvim_list_tabpages()
-call nvim_list_uis()
-call nvim_list_wins()
-call nvim_load_context()
-call nvim_notify()
-call nvim__ns_get()
-call nvim__ns_set()
-call nvim_open_term()
-call nvim_open_win()
-call nvim_out_write()
-call nvim_parse_cmd()
-call nvim_parse_expression()
-call nvim_paste()
-call nvim_put()
-call nvim__redraw()
-call nvim_replace_termcodes()
-call nvim__runtime_inspect()
-call nvim__screenshot()
-call nvim_select_popupmenu_item()
-call nvim_set_current_buf()
-call nvim_set_current_dir()
-call nvim_set_current_line()
-call nvim_set_current_tabpage()
-call nvim_set_current_win()
-call nvim_set_hl()
-call nvim_set_hl_ns()
-call nvim_set_hl_ns_fast()
-call nvim_set_keymap()
-call nvim_set_option()
-call nvim_set_option_value()
-call nvim_set_var()
-call nvim_set_vvar()
-call nvim__stats()
-call nvim_strwidth()
-call nvim_tabpage_del_var()
-call nvim_tabpage_get_number()
-call nvim_tabpage_get_var()
-call nvim_tabpage_get_win()
-call nvim_tabpage_is_valid()
-call nvim_tabpage_list_wins()
-call nvim_tabpage_set_var()
-call nvim_tabpage_set_win()
-call nvim__unpack()
-call nvim_win_close()
-call nvim_win_del_var()
-call nvim_win_get_buf()
-call nvim_win_get_config()
-call nvim_win_get_cursor()
-call nvim_win_get_height()
-call nvim_win_get_number()
-call nvim_win_get_option()
-call nvim_win_get_position()
-call nvim_win_get_tabpage()
-call nvim_win_get_var()
-call nvim_win_get_width()
-call nvim_win_hide()
-call nvim_win_is_valid()
-call nvim_win_set_buf()
-call nvim_win_set_config()
-call nvim_win_set_cursor()
-call nvim_win_set_height()
-call nvim_win_set_hl_ns()
-call nvim_win_set_option()
-call nvim_win_set_var()
-call nvim_win_set_width()
-call nvim_win_text_height()
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_shebang.vim b/uvim/runtime/syntax/testdir/input/vim_shebang.vim
deleted file mode 100644
index fd91617ae0..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_shebang.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env vim -S
-" Vim shebang line
-
-
-#!/usr/bin/env vim -S
diff --git a/uvim/runtime/syntax/testdir/runtest.vim b/uvim/runtime/syntax/testdir/runtest.mnv
index f71ccf1638..a09c6f1e1d 100644
--- a/uvim/runtime/syntax/testdir/runtest.vim
+++ b/uvim/runtime/syntax/testdir/runtest.mnv
@@ -3,7 +3,7 @@
 " Current directory must be runtime/syntax.
 
 " needed because of line-continuation lines
-set cpo&vim
+set cpo&mnv
 
 " Only do this with the +eval feature
 if 1
@@ -70,23 +70,23 @@ endif
 " therefore we must "cd" there.
 cd ../../src/testdir
 
-let s:vimcmdSyntaxFname = fnameescape(syntaxDir .. '/testdir/vimcmd')
+let s:mnvcmdSyntaxFname = fnameescape(syntaxDir .. '/testdir/mnvcmd')
 
-" Adapt "runtime/syntax/testdir/vimcmd" for "src/testdir/util/shared.vim".
-if filereadable(s:vimcmdSyntaxFname)
-  call delete('vimcmd')
-  call filecopy(s:vimcmdSyntaxFname, 'vimcmd')
-  exe 'au ExitPre <buffer> call delete("' .. fnameescape(getcwd() .. '/vimcmd') .. '")'
+" Adapt "runtime/syntax/testdir/mnvcmd" for "src/testdir/util/shared.mnv".
+if filereadable(s:mnvcmdSyntaxFname)
+  call delete('mnvcmd')
+  call filecopy(s:mnvcmdSyntaxFname, 'mnvcmd')
+  exe 'au ExitPre <buffer> call delete("' .. fnameescape(getcwd() .. '/mnvcmd') .. '")'
 endif
 
-source util/screendump.vim
-source util/term_util.vim
+source util/screendump.mnv
+source util/term_util.mnv
 exe 'cd ' .. fnameescape(syntaxDir)
 
-" For these tests we need to be able to run terminal Vim with 256 colors.  On
+" For these tests we need to be able to run terminal MNV with 256 colors.  On
 " MS-Windows the console only has 16 colors and the GUI can't run in a
 " terminal.
-if !CanRunVimInTerminal()
+if !CanRunMNVInTerminal()
   call Fatal('Cannot make screendumps, aborting')
 endif
 
@@ -117,10 +117,10 @@ func HandleSwapExists()
 endfunc
 
 " Trace ruler liveness on demand.
-if !empty($VIM_SYNTAX_TEST_LOG) && filewritable($VIM_SYNTAX_TEST_LOG)
+if !empty($MNV_SYNTAX_TEST_LOG) && filewritable($MNV_SYNTAX_TEST_LOG)
   def s:TraceRulerLiveness(context: string, times: number, tail: string)
     writefile([printf('%s: %4d: %s', context, times, tail)],
-	$VIM_SYNTAX_TEST_LOG,
+	$MNV_SYNTAX_TEST_LOG,
 	'a')
   enddef
 else
@@ -159,7 +159,7 @@ def s:TermPollRuler(
 	CannotDumpPage: func,	# (TYPE FOR LEGACY CONTEXT CALL SITES.)
 	buf: number,
 	in_name_and_out_name: string): list<string>
-  # Expect defaults from "term_util#RunVimInTerminal()".
+  # Expect defaults from "term_util#RunMNVInTerminal()".
   if winwidth(1) != 75 || winheight(1) != 20
     ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)',
       in_name_and_out_name,
@@ -173,7 +173,7 @@ def s:TermPollRuler(
   redraw
   # The contents of "ruler".
   var ruler: list<string> = []
-  # Attempts at most, targeting ASan-instrumented Vim builds.
+  # Attempts at most, targeting ASan-instrumented MNV builds.
   var times: number = 2048
   # Check "real estate" of the terminal buffer.  Read and compare its ruler
   # line and let "Xtestscript#s:AssertCursorForwardProgress()" do the rest.
@@ -196,7 +196,7 @@ enddef
 " the terminal buffer.  (Call the function before calling "VerifyScreenDump()"
 " for the first time.)
 def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list<string>
-  # Expect defaults from "term_util#RunVimInTerminal()".
+  # Expect defaults from "term_util#RunMNVInTerminal()".
   if winwidth(1) != 75 || winheight(1) != 20
     ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)',
       in_name_and_out_name,
@@ -206,11 +206,11 @@ def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list<stri
   endif
   # The contents of "ruler".
   var ruler: string = ''
-  # Attempts at most, targeting ASan-instrumented Vim builds.
+  # Attempts at most, targeting ASan-instrumented MNV builds.
   var times: number = 32768
   # Check "real estate" of the terminal buffer.  Expect a known token to be
   # rendered in the terminal buffer; its prefix must be "is_" so that buffer
-  # variables from "sh.vim" can be matched (see "Xtestscript#ShellInfo()").
+  # variables from "sh.mnv" can be matched (see "Xtestscript#ShellInfo()").
   # Verify that the whole line is available!
   while ruler !~# '^is_.\+\s\%(All\|Top\)$' && times > 0
     ruler = term_getline(buf, 20)
@@ -268,28 +268,28 @@ func RunTest()
     endfunc
 
     func LoadFiletype(type)
-      for file in glob("ftplugin/" .. a:type .. "*.vim", 1, 1)
+      for file in glob("ftplugin/" .. a:type .. "*.mnv", 1, 1)
 	exe "source " .. file
       endfor
       redraw!
     endfunc
 
-    func SetUpVim()
+    func SetUpMNV()
       call cursor(1, 1)
-      " Defend against rogue VIM_TEST_SETUP commands.
+      " Defend against rogue MNV_TEST_SETUP commands.
       for _ in range(20)
-	let lnum = search('\C\<VIM_TEST_SETUP\>', 'eW', 20)
+	let lnum = search('\C\<MNV_TEST_SETUP\>', 'eW', 20)
 	if lnum < 1
 	  break
 	endif
-	exe substitute(getline(lnum), '\C.*\<VIM_TEST_SETUP\>', '', '')
+	exe substitute(getline(lnum), '\C.*\<MNV_TEST_SETUP\>', '', '')
       endfor
       call cursor(1, 1)
-      " BEGIN [runtime/defaults.vim]
+      " BEGIN [runtime/defaults.mnv]
       " Also, disable italic highlighting to avoid issues on some terminals.
       set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
       syntax on
-      " END [runtime/defaults.vim]
+      " END [runtime/defaults.mnv]
       redraw!
     endfunc
 
@@ -394,9 +394,9 @@ func RunTest()
     enddef
   END
   let MAX_FAILED_COUNT = 5
-  let DUMP_OPTS = exists("$VIM_SYNTAX_TEST_WAIT_TIME") &&
-	  \ !empty($VIM_SYNTAX_TEST_WAIT_TIME)
-      \ ? {'wait': max([1, str2nr($VIM_SYNTAX_TEST_WAIT_TIME)])}
+  let DUMP_OPTS = exists("$MNV_SYNTAX_TEST_WAIT_TIME") &&
+	  \ !empty($MNV_SYNTAX_TEST_WAIT_TIME)
+      \ ? {'wait': max([1, str2nr($MNV_SYNTAX_TEST_WAIT_TIME)])}
       \ : {}
   lockvar DUMP_OPTS MAX_FAILED_COUNT XTESTSCRIPT
   let ok_count = 0
@@ -406,7 +406,7 @@ func RunTest()
   let last_test_status = 'invalid'
   let filter = ''
   " Create a map of setup configuration filenames with their basenames as keys.
-  let setup = glob('input/setup/*.vim', 1, 1)
+  let setup = glob('input/setup/*.mnv', 1, 1)
     \ ->reduce({d, f -> extend(d, {fnamemodify(f, ':t:r'): f})}, {})
   " Turn a subset of filenames etc. requested for testing into a pattern.
   if filereadable('../testdir/Xfilter')
@@ -422,9 +422,9 @@ func RunTest()
     let fnames = readdir(dirpath, {fname -> fname !~ '^README\.txt$'})
   else
     let dirpath = 'input/'
-    let filter ..= exists("$VIM_SYNTAX_TEST_FILTER") &&
-		\ !empty($VIM_SYNTAX_TEST_FILTER)
-      \ ? (empty(filter) ? '' : '\|') .. $VIM_SYNTAX_TEST_FILTER
+    let filter ..= exists("$MNV_SYNTAX_TEST_FILTER") &&
+		\ !empty($MNV_SYNTAX_TEST_FILTER)
+      \ ? (empty(filter) ? '' : '\|') .. $MNV_SYNTAX_TEST_FILTER
       \ : ''
     let fnames = readdir(dirpath,
 	\ {subset -> {fname -> fname !~ '\~$' && fname =~# subset}}(
@@ -459,18 +459,18 @@ func RunTest()
       " for the terminal window.
       redraw
 
-      " Let "Xtestscript#SetUpVim()" turn the syntax on.
+      " Let "Xtestscript#SetUpMNV()" turn the syntax on.
       let prefix = '-Nu NONE -S Xtestscript'
       let path = get(setup, root, '')
       " Source the found setup configuration file.
       let args = !empty(path)
 	\ ? prefix .. ' -S ' .. path
 	\ : prefix
-      let buf = RunVimInTerminal(args, {})
+      let buf = RunMNVInTerminal(args, {})
       " edit the file only after catching the SwapExists event
       call term_sendkeys(buf, ":edit " .. fname .. "\<CR>")
       " set up the testing environment
-      call term_sendkeys(buf, ":call SetUpVim()\<CR>")
+      call term_sendkeys(buf, ":call SetUpMNV()\<CR>")
       " load filetype specific settings
       call term_sendkeys(buf, ":call LoadFiletype('" .. filetype .. "')\<CR>")
 
@@ -512,7 +512,7 @@ func RunTest()
 	  " Make a screendump of every 18 lines of the file: failed/root_NN.dump
 	  let fail += VerifyScreenDump(buf, root_next, DUMP_OPTS)
 	endwhile
-	call StopVimInTerminal(buf)
+	call StopMNVInTerminal(buf)
       finally
 	call delete('Xtestscript')
       endtry
@@ -602,7 +602,7 @@ func RunTest()
 
   if !empty(failed_tests)
     call Message('')
-    call Message('View generated screendumps with "../../src/vim --clean -S testdir/viewdumps.vim"')
+    call Message('View generated screendumps with "../../src/mnv --clean -S testdir/viewdumps.mnv"')
   endif
 
   call AppendMessages('== SUMMARY SYNTAX TESTS ==')
@@ -620,4 +620,4 @@ endif
 
 qall!
 
-" vim:sw=2:ts=8:noet:
+" mnv:sw=2:ts=8:noet:
diff --git a/uvim/runtime/syntax/testdir/tools/maketestdeps b/uvim/runtime/syntax/testdir/tools/maketestdeps
index 61bf061f71..b8712723b8 100755
--- a/uvim/runtime/syntax/testdir/tools/maketestdeps
+++ b/uvim/runtime/syntax/testdir/tools/maketestdeps
@@ -3,7 +3,7 @@
 # - a phony target 'java' depends on all of the testdir/input/java*.java
 # - when the syntax file is changed, timestamps of the JAVA files are updated so that the tests will
 #   be rerun against updated syntax
-# - when a vim setup file for test, e.g. testdir/input/setup/java_module_info.vim, is changed,
+# - when a mnv setup file for test, e.g. testdir/input/setup/java_module_info.mnv, is changed,
 #   timestamp of the corresponding input, testdir/input/java_module_info.java, is updated
 #
 # NOTE: At the moment this script DOES NOT strictly track dependency, like cpp on c, so run
@@ -17,19 +17,19 @@ for input in testdir/input/*.*; do
 	basename=$(basename "$input")
 
 	case "$basename" in
-		vim9_*.*) ft=vim;;
+		mnv9_*.*) ft=mnv;;
 		*_*.*) ft=${basename%%_*};;
 		*.*) ft=${basename%%.*};;
 		*) exit 1
 	esac
 
-	vimsetup=$dirname/setup/${basename%.*}.vim
-	if [ ! -r "$vimsetup" ]; then
-		vimsetup=
+	mnvsetup=$dirname/setup/${basename%.*}.mnv
+	if [ ! -r "$mnvsetup" ]; then
+		mnvsetup=
 	fi
 
 	cat << EOF
-$input: $ft.vim $vimsetup
+$input: $ft.mnv $mnvsetup
 	touch -c \$@
 $basename:: $input
 $ft:: $basename
diff --git a/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh b/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
index f85252a32a..9dfdad306f 100755
--- a/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
+++ b/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
@@ -9,13 +9,13 @@
 #	argument.
 # 5) Summarise any differences.
 #
-# Provided that "git difftool" is set up (see src/testdir/commondumps.vim),
+# Provided that "git difftool" is set up (see src/testdir/commondumps.mnv),
 # run "git difftool HEAD -- '**/*.dump'" to collate tracked and generated
 # screendumps.
 
 case "$1" in
 -h | --help)
-	printf >&2 "Usage: [time VIM_SYNTAX_TEST_LOG=/tmp/log] $0 [1 | 2 | ...]\n"
+	printf >&2 "Usage: [time MNV_SYNTAX_TEST_LOG=/tmp/log] $0 [1 | 2 | ...]\n"
 	exit 0
 	;;
 esac
@@ -48,9 +48,9 @@ spuriosities=''
 # Because the clean target of Make will be executed before each syntax test,
 # this environment variable needs to be pointed to an existing file that is
 # created in a directory not affectable by the target.
-if test -w "$VIM_SYNTAX_TEST_LOG"
+if test -w "$MNV_SYNTAX_TEST_LOG"
 then
-	log=-e VIM_SYNTAX_TEST_LOG="$VIM_SYNTAX_TEST_LOG"
+	log=-e MNV_SYNTAX_TEST_LOG="$MNV_SYNTAX_TEST_LOG"
 else
 	log=
 fi
@@ -123,4 +123,4 @@ then
 	exit 87
 fi
 
-# vim:sw=8:ts=8:noet:nosta:
+# mnv:sw=8:ts=8:noet:nosta:
diff --git a/uvim/runtime/syntax/testdir/viewdumps.vim b/uvim/runtime/syntax/testdir/viewdumps.mnv
index 9c4de1b930..6e501da264 100644
--- a/uvim/runtime/syntax/testdir/viewdumps.vim
+++ b/uvim/runtime/syntax/testdir/viewdumps.mnv
@@ -1,8 +1,8 @@
-vim9script
+mnv9script
 
 exec 'source ' .. (((cwdpath: string) => cwdpath
-  ->strpart(0, cwdpath->strridx('/vim')))(getcwd()))
-  .. '/vim/src/testdir/commondumps.vim'
+  ->strpart(0, cwdpath->strridx('/mnv')))(getcwd()))
+  .. '/mnv/src/testdir/commondumps.mnv'
 g:Init('\<syntax\>', -1)
 
 # THE FOLLOWING SETTINGS PERTAIN TO "input/" FILES THAT ARE LIKELY TO BE
@@ -11,14 +11,14 @@ g:Init('\<syntax\>', -1)
 # Match "LC_ALL=C" of Makefile.
 language C
 
-# Match the settings from term_util.vim#RunVimInTerminal().
+# Match the settings from term_util.mnv#RunMNVInTerminal().
 set t_Co=256 background=light
 hi Normal ctermfg=NONE ctermbg=NONE
 
-# Match the settings from runtest.vim#Xtestscript#SetUpVim().
+# Match the settings from runtest.mnv#Xtestscript#SetUpMNV().
 set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
 
 # Anticipate non-Latin-1 characters in "input/" files.
 set encoding=utf-8 termencoding=utf-8
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
+# mnv:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/uvim/runtime/syntax/tex.vim b/uvim/runtime/syntax/tex.mnv
index 455613c8fb..5a425a48ed 100644
--- a/uvim/runtime/syntax/tex.vim
+++ b/uvim/runtime/syntax/tex.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TeX
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Apr 22, 2022
-"   2024 Feb 19 by Vim Project: announce adoption
-"   2025 Jan 18 by Vim Project: add texEmphStyle to texMatchGroup, #16228
-"   2025 Feb 08 by Vim Project: improve macro option, \providecommand,
+"   2024 Feb 19 by MNV Project: announce adoption
+"   2025 Jan 18 by MNV Project: add texEmphStyle to texMatchGroup, #16228
+"   2025 Feb 08 by MNV Project: improve macro option, \providecommand,
 "                               \newcommand and \newenvironment #16543
-"   2025 Sep 29 by Vim Project: add amsmath support #18433
-"   2025 Oct 06 by Vim Project: link texBoldStyle to Bold, etc #18505
+"   2025 Sep 29 by MNV Project: add amsmath support #18433
+"   2025 Oct 06 by MNV Project: link texBoldStyle to Bold, etc #18505
 " Version:	121
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
 "
@@ -52,7 +52,7 @@ if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 scriptencoding utf-8
 
 " by default, enable all region-based highlighting
@@ -106,7 +106,7 @@ if !exists("g:tex_fold_enabled")
  let s:tex_fold_enabled= 0
 elseif g:tex_fold_enabled && !has("folding")
  let s:tex_fold_enabled= 0
- echomsg "Ignoring g:tex_fold_enabled=".g:tex_fold_enabled."; need to re-compile vim for +fold support"
+ echomsg "Ignoring g:tex_fold_enabled=".g:tex_fold_enabled."; need to re-compile mnv for +fold support"
 else
  let s:tex_fold_enabled= 1
 endif
@@ -1392,4 +1392,4 @@ unlet s:extfname
 let   b:current_syntax = "tex"
 let &cpo               = s:keepcpo
 unlet s:keepcpo
-" vim: ts=8 fdm=marker
+" mnv: ts=8 fdm=marker
diff --git a/uvim/runtime/syntax/texinfo.vim b/uvim/runtime/syntax/texinfo.mnv
index 79a4dfe821..d40270e768 100644
--- a/uvim/runtime/syntax/texinfo.vim
+++ b/uvim/runtime/syntax/texinfo.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         Texinfo (documentation format)
 " Maintainer:       Robert Dodier <robert.dodier@gmail.com>
 " Latest Revision:  2021-12-15
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match texinfoControlSequence display '\(@end [a-zA-Z@]\+\|@[a-zA-Z@]\+\)'
 
diff --git a/uvim/runtime/syntax/texmf.vim b/uvim/runtime/syntax/texmf.mnv
index d1268faff7..609f19f80b 100644
--- a/uvim/runtime/syntax/texmf.vim
+++ b/uvim/runtime/syntax/texmf.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: Web2C TeX texmf.cnf configuration file
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2001-05-13
-" URL: http://physics.muni.cz/~yeti/download/syntax/texmf.vim
+" URL: http://physics.muni.cz/~yeti/download/syntax/texmf.mnv
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/tf.vim b/uvim/runtime/syntax/tf.mnv
index df6adcf819..c6158a0708 100644
--- a/uvim/runtime/syntax/tf.vim
+++ b/uvim/runtime/syntax/tf.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	tf
 " Maintainer:	Lutz Eymers <ixtab@polzin.com>
-" URL:		http://www.isp.de/data/tf.vim
-" Email:	send syntax_vim.tgz
+" URL:		http://www.isp.de/data/tf.mnv
+" Email:	send syntax_mnv.tgz
 " Last Change:	2001 May 10
 "
 " Options	lite_minlines = x     to sync at least x lines backwards
@@ -193,4 +193,4 @@ if main_syntax == 'tf'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/thrift.vim b/uvim/runtime/syntax/thrift.mnv
index 502e98852a..e0c90f1d58 100644
--- a/uvim/runtime/syntax/thrift.vim
+++ b/uvim/runtime/syntax/thrift.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Thrift
 " Original Author: Martin Smith <martin@facebook.com>
 " Maintainer: Yinzuo Jiang <jiangyinzuo@foxmail.com>
 " Last Change: 2024/07/29
-" https://github.com/apache/thrift/blob/master/contrib/thrift.vim
+" https://github.com/apache/thrift/blob/master/contrib/thrift.mnv
 "
 " Licensed to the Apache Software Foundation (ASF) under one
 " or more contributor license agreements. See the NOTICE file
diff --git a/uvim/runtime/syntax/tiasm.vim b/uvim/runtime/syntax/tiasm.mnv
index c79596bdfe..645c7b90cb 100644
--- a/uvim/runtime/syntax/tiasm.vim
+++ b/uvim/runtime/syntax/tiasm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TI linear assembly language
 " Document:	https://downloads.ti.com/docs/esd/SPRUI03B/#SPRUI03B_HTML/assembler-description.html
 " Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
diff --git a/uvim/runtime/syntax/tidy.vim b/uvim/runtime/syntax/tidy.mnv
index 7ffda90e55..1d9de88fb7 100644
--- a/uvim/runtime/syntax/tidy.vim
+++ b/uvim/runtime/syntax/tidy.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	HMTL Tidy Configuration
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2020 Sep 4
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn iskeyword @,48-57,-,_
 
@@ -273,4 +273,4 @@ let b:current_syntax = "tidy"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker
+" mnv: ts=8 fdm=marker
diff --git a/uvim/runtime/syntax/tilde.vim b/uvim/runtime/syntax/tilde.mnv
index d2a3360d24..58f9cb1322 100644
--- a/uvim/runtime/syntax/tilde.vim
+++ b/uvim/runtime/syntax/tilde.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
-" This file works only for Vim6.x
+" MNV syntax file
+" This file works only for MNV6.x
 " Language:	Tilde
 " Maintainer:	Tobias Rundström <tobi@tildesoftware.net>
 " URL:		http://www.tildesoftware.net
-" CVS:		$Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $
+" CVS:		$Id: tilde.mnv,v 1.1 2004/06/13 19:31:51 mnvboss Exp $
 
 if exists("b:current_syntax")
   finish
diff --git a/uvim/runtime/syntax/tli.vim b/uvim/runtime/syntax/tli.mnv
index b96d4a2119..375c910f1a 100644
--- a/uvim/runtime/syntax/tli.vim
+++ b/uvim/runtime/syntax/tli.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	TealInfo source files (*.tli)
 " Maintainer:	Kurt W. Andrews <kandrews@fastrans.net>
 " Last Change:	2001 May 10
@@ -55,4 +55,4 @@ hi def link tliStyle      PreProc
 
 let b:current_syntax = "tli"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/tmux.vim b/uvim/runtime/syntax/tmux.mnv
index 4b8454dd51..1041615b2c 100644
--- a/uvim/runtime/syntax/tmux.vim
+++ b/uvim/runtime/syntax/tmux.mnv
@@ -1,6 +1,6 @@
 " Language: tmux(1) configuration file
 " Version: 3.4 (git-3d8ead8a)
-" URL: https://github.com/ericpruitt/tmux.vim/
+" URL: https://github.com/ericpruitt/tmux.mnv/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
 
@@ -8,10 +8,10 @@ if exists("b:current_syntax")
     finish
 endif
 
-" Explicitly change compatibility options to Vim's defaults because this file
+" Explicitly change compatibility options to MNV's defaults because this file
 " uses line continuations.
 let s:original_cpo = &cpo
-set cpo&vim
+set cpo&mnv
 
 let b:current_syntax = "tmux"
 syntax iskeyword @,48-57,_,192-255,-
diff --git a/uvim/runtime/syntax/toml.vim b/uvim/runtime/syntax/toml.mnv
index c91c1c3ba0..f7a76b0ea1 100644
--- a/uvim/runtime/syntax/toml.vim
+++ b/uvim/runtime/syntax/toml.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:            TOML
-" Homepage:            https://github.com/cespare/vim-toml
+" Homepage:            https://github.com/cespare/mnv-toml
 " Maintainer:          Aman Verma
 " Previous Maintainer: Caleb Spare <cespare@gmail.com>
 " Last Change:         Mar 10, 2026
@@ -79,4 +79,4 @@ hi def link tomlEscape SpecialChar
 syn sync minlines=500
 let b:current_syntax = 'toml'
 
-" vim: et sw=2 sts=2
+" mnv: et sw=2 sts=2
diff --git a/uvim/runtime/syntax/tpp.vim b/uvim/runtime/syntax/tpp.mnv
index e2b307b2a2..19c68633ee 100644
--- a/uvim/runtime/syntax/tpp.vim
+++ b/uvim/runtime/syntax/tpp.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language: tpp - Text Presentation Program
-" Maintainer: Debian Vim Maintainers
+" Maintainer: Debian MNV Maintainers
 " Former Maintainer: Gerfried Fuchs <alfie@ist.org>
 " Last Change: 2023 Jan 16
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/tpp.vim
+" URL: https://salsa.debian.org/mnv-team/mnv-debian/blob/main/syntax/tpp.mnv
 " Filenames: *.tpp
 " License: BSD
 "
-" XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain
+" XXX This file is in need of a new maintainer, Debian MNV Maintainers maintain
 "     it only because patches have been submitted for it by Debian users and the
 "     former maintainer was MIA (Missing In Action), taking over its
 "     maintenance was thus the only way to include those patches.
@@ -48,7 +48,7 @@ syn region tppAbstractOption start="^--\%(author\|title\|date\|footer\)" end="$"
 
 if main_syntax !=# 'sh'
   " shell command
-  syn include @tppShExec syntax/sh.vim
+  syn include @tppShExec syntax/sh.mnv
   unlet b:current_syntax
 
   syn region shExec matchgroup=tppPageLocalOptionKey start='^--exec *' keepend end='$' contains=@tppShExec
@@ -80,4 +80,4 @@ hi def link tppTimeOption			Error
 
 let b:current_syntax = 'tpp'
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/trasys.vim b/uvim/runtime/syntax/trasys.mnv
index d52b5eeb47..275f1ccf0b 100644
--- a/uvim/runtime/syntax/trasys.vim
+++ b/uvim/runtime/syntax/trasys.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TRASYS input file
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.inp
-" URL:		http://www.naglenet.org/vim/syntax/trasys.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/trasys.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -18,7 +18,7 @@ endif
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-runtime! syntax/fortran.vim
+runtime! syntax/fortran.mnv
 unlet b:current_syntax
 
 
@@ -157,4 +157,4 @@ hi def link trasysTodo		Todo
 
 let b:current_syntax = "trasys"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/treetop.vim b/uvim/runtime/syntax/treetop.mnv
index 60bbf26193..942f27b275 100644
--- a/uvim/runtime/syntax/treetop.vim
+++ b/uvim/runtime/syntax/treetop.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Treetop
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2011-03-14
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword treetopTodo
       \ contained
@@ -22,7 +22,7 @@ syn match treetopComment
                         \ display
                         \ contains=treetopTodo
 
-syn include @treetopRuby syntax/ruby.vim
+syn include @treetopRuby syntax/ruby.mnv
 unlet b:current_syntax
 
 syn keyword treetopKeyword
diff --git a/uvim/runtime/syntax/trustees.vim b/uvim/runtime/syntax/trustees.mnv
index 3a7d26e896..1d72105d02 100644
--- a/uvim/runtime/syntax/trustees.vim
+++ b/uvim/runtime/syntax/trustees.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     trustees
 " Maintainer:   Nima Talebi <nima@it.net.au>
 " Last Change:  2022 Jun 14
diff --git a/uvim/runtime/syntax/tsalt.vim b/uvim/runtime/syntax/tsalt.mnv
index 6f74ad2eb3..ba787c4687 100644
--- a/uvim/runtime/syntax/tsalt.vim
+++ b/uvim/runtime/syntax/tsalt.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Telix (Modem Comm Program) SALT Script
 " Maintainer:	Sean M. McKee <mckee@misslink.net>
 " Last Change:	2012 Feb 03 by Thilo Six
-" Version Info: @(#)tsalt.vim	1.5	97/12/16 08:11:15
+" Version Info: @(#)tsalt.mnv	1.5	97/12/16 08:11:15
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " turn case matching off
 syn case ignore
@@ -203,4 +203,4 @@ let b:current_syntax = "tsalt"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/tsscl.vim b/uvim/runtime/syntax/tsscl.mnv
index df804b2f88..cbd8437ad9 100644
--- a/uvim/runtime/syntax/tsscl.vim
+++ b/uvim/runtime/syntax/tsscl.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TSS (Thermal Synthesizer System) Command Line
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.tsscl
-" URL:		http://www.naglenet.org/vim/syntax/tsscl.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/tsscl.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -26,8 +26,8 @@ syn case ignore
 "
 
 " Load TSS geometry syntax file
-"source $VIM/myvim/tssgm.vim
-"source $VIMRUNTIME/syntax/c.vim
+"source $MNV/mymnv/tssgm.mnv
+"source $MNVRUNTIME/syntax/c.mnv
 
 " Define keywords for TSS
 syn keyword tssclCommand  begin radk list heatrates attr draw
@@ -201,4 +201,4 @@ hi def link tssclScientific	Number
 
 let b:current_syntax = "tsscl"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/tssgm.vim b/uvim/runtime/syntax/tssgm.mnv
index 8ca7962e81..84f29ab1e8 100644
--- a/uvim/runtime/syntax/tssgm.vim
+++ b/uvim/runtime/syntax/tssgm.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TSS (Thermal Synthesizer System) Geometry
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.tssgm
-" URL:		http://www.naglenet.org/vim/syntax/tssgm.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/tssgm.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -95,4 +95,4 @@ hi def link tssgmScientific	Float
 
 let b:current_syntax = "tssgm"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/tssop.vim b/uvim/runtime/syntax/tssop.mnv
index 6a775b2358..f058e77603 100644
--- a/uvim/runtime/syntax/tssop.vim
+++ b/uvim/runtime/syntax/tssop.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TSS (Thermal Synthesizer System) Optics
 " Maintainer:   Adrian Nagle, anagle@ball.com
 " Last Change:  2003 May 11
 " Filenames:    *.tssop
-" URL:		http://www.naglenet.org/vim/syntax/tssop.vim
-" MAIN URL:     http://www.naglenet.org/vim/
+" URL:		http://www.naglenet.org/mnv/syntax/tssop.mnv
+" MAIN URL:     http://www.naglenet.org/mnv/
 
 
 
@@ -71,4 +71,4 @@ hi def link tssopScientific	Float
 
 let b:current_syntax = "tssop"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/tsv.vim b/uvim/runtime/syntax/tsv.mnv
index f0dd9f717d..0a74dab82f 100644
--- a/uvim/runtime/syntax/tsv.vim
+++ b/uvim/runtime/syntax/tsv.mnv
@@ -1,4 +1,4 @@
-" Vim filetype plugin file
+" MNV filetype plugin file
 " Language:	Tab separated values (TSV)
 " Last Change:	2024 Jul 16
 " This runtime file is looking for a new maintainer.
@@ -8,5 +8,5 @@ if exists('b:current_syntax')
 endif
 
 let b:csv_delimiter = '\t'  " enforce tab delimiter
-runtime! syntax/csv.vim
+runtime! syntax/csv.mnv
 let b:current_syntax = 'tsv'
diff --git a/uvim/runtime/syntax/tt2.vim b/uvim/runtime/syntax/tt2.mnv
index 100eb6e6a1..de5fd1bac9 100644
--- a/uvim/runtime/syntax/tt2.vim
+++ b/uvim/runtime/syntax/tt2.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      TT2 (Perl Template Toolkit)
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
-" Author:        Moriki, Atsushi <4woods+vim@gmail.com>
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
+" Author:        Moriki, Atsushi <4woods+mnv@gmail.com>
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2018 Mar 28
 "
 " Installation:
-"   put tt2.vim and tt2html.vim in to your syntax directory.
+"   put tt2.mnv and tt2html.mnv in to your syntax directory.
 "
-"   add below in your filetype.vim.
+"   add below in your filetype.mnv.
 "       au BufNewFile,BufRead *.tt2 setf tt2
 "           or
 "       au BufNewFile,BufRead *.tt2
@@ -59,7 +59,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -94,7 +94,7 @@ if exists("b:tt2_syn_tags")
 
         "Include Perl syntax when 'PERL' 'RAWPERL' block
         if b:tt2_syn_inc_perl
-            syn include @Perl syntax/perl.vim
+            syn include @Perl syntax/perl.mnv
             exec 'syn region tt2_perlcode '.
                         \ 'start=+\(\(RAW\)\=PERL\s*[-]\=' . s:ed . '\(\n\)\=\)\@<=+ ' .
                         \ 'end=+' . s:st . '[-]\=\s*END+me=s-1 contains=@Perl keepend'
@@ -121,7 +121,7 @@ else
 
     "Include Perl syntax when 'PERL' 'RAWPERL' block
     if b:tt2_syn_inc_perl
-        syn include @Perl syntax/perl.vim
+        syn include @Perl syntax/perl.mnv
         syn region tt2_perlcode
                     \ start=+\(\(RAW\)\=PERL\s*[-]\=%]\(\n\)\=\)\@<=+
                     \ end=+\[%[-]\=\s*END+me=s-1
@@ -206,4 +206,4 @@ let b:current_syntax = "tt2"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:ts=4:sw=4
+" mnv:ts=4:sw=4
diff --git a/uvim/runtime/syntax/tt2html.mnv b/uvim/runtime/syntax/tt2html.mnv
new file mode 100644
index 0000000000..af267ba045
--- /dev/null
+++ b/uvim/runtime/syntax/tt2html.mnv
@@ -0,0 +1,22 @@
+" MNV syntax file
+" Language:      TT2 embedded with HTML
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
+" Author:        Moriki, Atsushi <4woods+mnv@gmail.com>
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
+" Last Change:   2018 Mar 28
+
+if exists("b:current_syntax")
+    finish
+endif
+
+runtime! syntax/html.mnv
+unlet b:current_syntax
+
+runtime! syntax/tt2.mnv
+unlet b:current_syntax
+
+syn cluster htmlPreProc add=@tt2_top_cluster
+
+let b:current_syntax = "tt2html"
diff --git a/uvim/runtime/syntax/tt2html.vim b/uvim/runtime/syntax/tt2html.vim
deleted file mode 100644
index f489182d5f..0000000000
--- a/uvim/runtime/syntax/tt2html.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" Vim syntax file
-" Language:      TT2 embedded with HTML
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
-" Author:        Moriki, Atsushi <4woods+vim@gmail.com>
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
-" Last Change:   2018 Mar 28
-
-if exists("b:current_syntax")
-    finish
-endif
-
-runtime! syntax/html.vim
-unlet b:current_syntax
-
-runtime! syntax/tt2.vim
-unlet b:current_syntax
-
-syn cluster htmlPreProc add=@tt2_top_cluster
-
-let b:current_syntax = "tt2html"
diff --git a/uvim/runtime/syntax/tt2js.vim b/uvim/runtime/syntax/tt2js.mnv
index 52e5a3c54a..ffb4199885 100644
--- a/uvim/runtime/syntax/tt2js.vim
+++ b/uvim/runtime/syntax/tt2js.mnv
@@ -1,20 +1,20 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      TT2 embedded with Javascript
 " Maintainer:    Andy Lester <andy@petdance.com>
 " Author:        Yates, Peter <pd.yates@gmail.com>
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2018 Mar 28
 
 if exists("b:current_syntax")
     finish
 endif
 
-runtime! syntax/javascript.vim
+runtime! syntax/javascript.mnv
 unlet b:current_syntax
 
-runtime! syntax/tt2.vim
+runtime! syntax/tt2.mnv
 unlet b:current_syntax
 
 syn cluster javascriptPreProc add=@tt2_top_cluster
diff --git a/uvim/runtime/syntax/tutor.vim b/uvim/runtime/syntax/tutor.mnv
index 7d0cd31c1d..283a18ecf7 100644
--- a/uvim/runtime/syntax/tutor.vim
+++ b/uvim/runtime/syntax/tutor.mnv
@@ -1,5 +1,5 @@
-" Language:	Vim Tutor
-" Maintainer:	Vim Project
+" Language:	MNV Tutor
+" Maintainer:	MNV Project
 " Last Change:	2025 Apr 16
 
 if exists("b:current_syntax")
@@ -7,13 +7,13 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-syn include @VIM syntax/vim.vim
+syn include @MNV syntax/mnv.mnv
 unlet b:current_syntax
-syn include @TUTORSHELL syntax/sh.vim
+syn include @TUTORSHELL syntax/sh.mnv
 unlet b:current_syntax
-syn include @VIMNORMAL syntax/vimnormal.vim
+syn include @MNVNORMAL syntax/mnvnormal.mnv
 
 syn match tutorLink /\[.\{-}\](.\{-})/ contains=tutorInlineNormal
 syn match tutorLinkBands /\[\|\]\|(\|)/ contained containedin=tutorLink,tutorLinkAnchor conceal
@@ -45,13 +45,13 @@ syn match tutorShellPrompt /\(^\s*\)\@<=[$#]/ contained containedin=tutorShell
 
 syn region tutorInlineCode matchgroup=Delimiter start=/\\\@<!`/ end=/\\\@<!\(`{\@!\|`\s\)/ concealends
 
-syn region tutorCommand matchgroup=Delimiter start=/^\~\{3} cmd\( :\)\?\s*$/ end=/^\~\{3}/ keepend contains=@VIM concealends
-syn region tutorInlineCommand matchgroup=Delimiter start=/\\\@<!`\(.*`{vim}\)\@=/ end=/\\\@<!`\({vim}\)\@=/ nextgroup=tutorInlineType contains=@VIM concealends keepend
+syn region tutorCommand matchgroup=Delimiter start=/^\~\{3} cmd\( :\)\?\s*$/ end=/^\~\{3}/ keepend contains=@MNV concealends
+syn region tutorInlineCommand matchgroup=Delimiter start=/\\\@<!`\(.*`{mnv}\)\@=/ end=/\\\@<!`\({mnv}\)\@=/ nextgroup=tutorInlineType contains=@MNV concealends keepend
 
-syn region tutorNormal matchgroup=Delimiter start=/^\~\{3} norm\(al\?\)\?\s*$/ end=/^\~\{3}/ contains=@VIMNORMAL concealends
-syn region tutorInlineNormal matchgroup=Delimiter start=/\\\@<!`\(\S*`{normal}\)\@=/ end=/\\\@<!`\({normal}\)\@=/ nextgroup=tutorInlineType contains=@VIMNORMAL concealends keepend
+syn region tutorNormal matchgroup=Delimiter start=/^\~\{3} norm\(al\?\)\?\s*$/ end=/^\~\{3}/ contains=@MNVNORMAL concealends
+syn region tutorInlineNormal matchgroup=Delimiter start=/\\\@<!`\(\S*`{normal}\)\@=/ end=/\\\@<!`\({normal}\)\@=/ nextgroup=tutorInlineType contains=@MNVNORMAL concealends keepend
 
-syn match tutorInlineType /{\(normal\|vim\)}/ contained conceal
+syn match tutorInlineType /{\(normal\|mnv\)}/ contained conceal
 
 syn match tutorInlineOK /✓/
 syn match tutorInlineX /✗/
diff --git a/uvim/runtime/syntax/typescript.vim b/uvim/runtime/syntax/typescript.mnv
index 03520fd56a..b25f4f5558 100644
--- a/uvim/runtime/syntax/typescript.vim
+++ b/uvim/runtime/syntax/typescript.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TypeScript
 " Maintainer:   Herrington Darkholme
 " Last Change:  2024 May 24
-" Based On:     Herrington Darkholme's yats.vim
-" Changes:      Go to https://github.com/HerringtonDarkholme/yats.vim for recent changes.
+" Based On:     Herrington Darkholme's yats.mnv
+" Changes:      Go to https://github.com/HerringtonDarkholme/yats.mnv for recent changes.
 " Origin:       https://github.com/othree/yajs
 " Credits:      Kao Wei-Ko(othree), Jose Elera Campana, Zhao Yi, Claudio Fleiner, Scott Shattuck
-"               (This file is based on their hard work), gumnos (From the #vim
+"               (This file is based on their hard work), gumnos (From the #mnv
 "               IRC Channel in Freenode)
 
-" This is the same syntax that is in yats.vim, but:
+" This is the same syntax that is in yats.mnv, but:
 " - flattened into one file
 " - HiLink commands changed to "hi def link"
-" - Setting 'cpo' to the Vim value
+" - Setting 'cpo' to the MNV value
 
 if !exists("main_syntax")
   if exists("b:current_syntax")
@@ -22,7 +22,7 @@ if !exists("main_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " this region is NOT used in TypeScriptReact
 " nextgroup doesn't contain objectLiteral, let outer region contains it
@@ -34,8 +34,8 @@ syntax region typescriptTypeCast matchgroup=typescriptTypeBrackets
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
-" Source the part common with typescriptreact.vim
-source <sfile>:h/shared/typescriptcommon.vim
+" Source the part common with typescriptreact.mnv
+source <sfile>:h/shared/typescriptcommon.mnv
 
 
 let b:current_syntax = "typescript"
diff --git a/uvim/runtime/syntax/typescriptreact.vim b/uvim/runtime/syntax/typescriptreact.mnv
index 061ec4d81e..9f12206015 100644
--- a/uvim/runtime/syntax/typescriptreact.vim
+++ b/uvim/runtime/syntax/typescriptreact.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     TypeScript with React (JSX)
-" Maintainer:   The Vim Project <https://github.com/vim/vim>
+" Maintainer:   The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:  2024 May 26
-" Based On:     Herrington Darkholme's yats.vim
-" Changes:      See https://github.com/HerringtonDarkholme/yats.vim
-" Credits:      See yats.vim on github
+" Based On:     Herrington Darkholme's yats.mnv
+" Changes:      See https://github.com/HerringtonDarkholme/yats.mnv
+" Credits:      See yats.mnv on github
 
 if !exists("main_syntax")
   if exists("b:current_syntax")
@@ -14,7 +14,7 @@ if !exists("main_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax region tsxTag
       \ start=+<\([^/!?<>="':]\+\)\@=+
@@ -133,8 +133,8 @@ syntax region tsxEscJs
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""
-" Source the part common with typescriptreact.vim
-source <sfile>:h/shared/typescriptcommon.vim
+" Source the part common with typescriptreact.mnv
+source <sfile>:h/shared/typescriptcommon.mnv
 
 
 syntax cluster typescriptExpression add=tsxRegion,tsxFragment
diff --git a/uvim/runtime/syntax/typst.vim b/uvim/runtime/syntax/typst.mnv
index 8ed2f69c89..ee266deb0c 100644
--- a/uvim/runtime/syntax/typst.vim
+++ b/uvim/runtime/syntax/typst.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Previous Maintainer:  Luca Saccarola <github.e41mv@aleeas.com>
 " Maintainer:  This runtime file is looking for a new maintainer.
 " Language:    Typst
-" Based On:    https://github.com/kaarmu/typst.vim
+" Based On:    https://github.com/kaarmu/typst.mnv
 " Last Change: 2025 Aug 05
 
 if exists('b:current_syntax')
@@ -10,7 +10,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syntax sync fromstart
 syntax spell toplevel
@@ -291,7 +291,7 @@ syntax region typstMarkupCodeBlockTypst
 for s:name in get(g:, 'typst_embedded_languages', [])
     let s:include = ['syntax include'
                 \   ,'@typstEmbedded_'..s:name
-                \   ,'syntax/'..s:name..'.vim']
+                \   ,'syntax/'..s:name..'.mnv']
     let s:rule = ['syn region'
                 \,s:name
                 \,'matchgroup=Macro'
diff --git a/uvim/runtime/syntax/uc.vim b/uvim/runtime/syntax/uc.mnv
index 90d33396c5..3ca2a9a896 100644
--- a/uvim/runtime/syntax/uc.vim
+++ b/uvim/runtime/syntax/uc.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	UnrealScript
 " Maintainer:	Mark Ferrell <major@chaoticdreams.org>
-" URL:		ftp://ftp.chaoticdreams.org/pub/ut/vim/uc.vim
-" Credits:	Based on the java.vim syntax file by Claudio Fleiner
+" URL:		ftp://ftp.chaoticdreams.org/pub/ut/mnv/uc.mnv
+" Credits:	Based on the java.mnv syntax file by Claudio Fleiner
 " Last change:	2003 May 31
 
-" Please check :help uc.vim for comments on some of the options available.
+" Please check :help uc.mnv for comments on some of the options available.
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -162,4 +162,4 @@ if main_syntax == 'uc'
   unlet main_syntax
 endif
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/uci.vim b/uvim/runtime/syntax/uci.mnv
index fdf5bfd9b3..500656b9e9 100644
--- a/uvim/runtime/syntax/uci.vim
+++ b/uvim/runtime/syntax/uci.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenWrt Unified Configuration Interface
 " Maintainer:	Colin Caine <complaints@cmcaine.co.uk>
-" Upstream:	https://github.com/cmcaine/vim-uci
+" Upstream:	https://github.com/cmcaine/mnv-uci
 " Last Change:	2021 Sep 19
 "
 " For more information on uci, see https://openwrt.org/docs/guide-user/base-system/uci
diff --git a/uvim/runtime/syntax/udevconf.vim b/uvim/runtime/syntax/udevconf.mnv
index 82fd81daf6..0d1f135a6f 100644
--- a/uvim/runtime/syntax/udevconf.vim
+++ b/uvim/runtime/syntax/udevconf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             udev(8) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword udevconfTodo        contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/udevperm.vim b/uvim/runtime/syntax/udevperm.mnv
index abda0b6663..d91c101e0e 100644
--- a/uvim/runtime/syntax/udevperm.vim
+++ b/uvim/runtime/syntax/udevperm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             udev(8) permissions file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match   udevpermBegin       display '^' nextgroup=udevpermDevice
 
diff --git a/uvim/runtime/syntax/udevrules.vim b/uvim/runtime/syntax/udevrules.mnv
index ce156ccc13..250fb87e0d 100644
--- a/uvim/runtime/syntax/udevrules.vim
+++ b/uvim/runtime/syntax/udevrules.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             udev(8) rules file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-12-18
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " TODO: Line continuations.
 
diff --git a/uvim/runtime/syntax/uil.vim b/uvim/runtime/syntax/uil.mnv
index 088a0f6c86..a399554655 100644
--- a/uvim/runtime/syntax/uil.vim
+++ b/uvim/runtime/syntax/uil.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Motif UIL (User Interface Language)
 " Maintainer:	Thomas Koehler <jean-luc@picard.franken.de>
 "		Please be aware: I'm often slow to answer email due to a high
 "		non-computer related workload (sometimes 4-8 weeks)
 " Last Change:	2016 September 6
-" URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim
+" URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/mnv/syntax/uil.mnv
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -72,4 +72,4 @@ hi def link uilTodo		Todo
 
 let b:current_syntax = "uil"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/unison.vim b/uvim/runtime/syntax/unison.mnv
index a1f8cb0990..2368f300d6 100644
--- a/uvim/runtime/syntax/unison.vim
+++ b/uvim/runtime/syntax/unison.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 "
 " Language:        unison
 " Maintainer:      Anton Parkhomenko <anton@chuwy.me>
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-syntax include @markdown $VIMRUNTIME/syntax/markdown.vim
+syntax include @markdown $MNVRUNTIME/syntax/markdown.mnv
 
 syn cluster markdownLikeDocs contains=markdownBold,markdownItalic,markdownLinkText,markdownListMarker,markdownOrderedListMarker,markdownH1,markdownH2,markdownH3,markdownH4,markdownH5,markdownH6
 
@@ -28,7 +28,7 @@ syn match   unisonFloat		"\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
 
 " Keyword definitions. These must be patterns instead of keywords
 " because otherwise they would match as keywords at the start of a
-" "literate" comment (see lu.vim).
+" "literate" comment (see lu.mnv).
 syn match unisonModule		"\<namespace\>"
 syn match unisonImport		"\<use\>"
 syn match unisonTypedef		"\<\(unique\|structural\|∀\|forall\)\>"
@@ -102,4 +102,4 @@ hi def link       unisonTypedef                         Typedef
 
 let b:current_syntax = "unison"
 
-" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
+" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=mnv
diff --git a/uvim/runtime/syntax/updatedb.vim b/uvim/runtime/syntax/updatedb.mnv
index 224a7dd2c2..4769ad5df7 100644
--- a/uvim/runtime/syntax/updatedb.vim
+++ b/uvim/runtime/syntax/updatedb.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             updatedb.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2009-05-25
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword updatedbTodo    contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/upstart.vim b/uvim/runtime/syntax/upstart.mnv
index 140cd174e0..b095b49aeb 100644
--- a/uvim/runtime/syntax/upstart.vim
+++ b/uvim/runtime/syntax/upstart.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Upstart job files
 " Maintainer:	Michael Biebl <biebl@debian.org>
 "		James Hunt <james.hunt@ubuntu.com>
 " Last Change:	2012 Jan 16
-" License:	The Vim license
+" License:	The MNV license
 " Version:	0.4
 " Remark:	Syntax highlighting for Upstart (init(8)) job files.
 "
-" It is inspired by the initng syntax file and includes sh.vim to do the
+" It is inspired by the initng syntax file and includes sh.mnv to do the
 " highlighting of script blocks.
 
 " quit when a syntax file was already loaded
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 let is_bash = 1
-syn include @Shell syntax/sh.vim
+syn include @Shell syntax/sh.mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/upstreamdat.vim b/uvim/runtime/syntax/upstreamdat.mnv
index e3b415a4bc..4c51020759 100644
--- a/uvim/runtime/syntax/upstreamdat.vim
+++ b/uvim/runtime/syntax/upstreamdat.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Innovation Data Processing upstream.dat file
 " Maintainer:		Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:	2013-11-27
diff --git a/uvim/runtime/syntax/upstreaminstalllog.vim b/uvim/runtime/syntax/upstreaminstalllog.mnv
index fb23fdcca0..96df2bff63 100644
--- a/uvim/runtime/syntax/upstreaminstalllog.vim
+++ b/uvim/runtime/syntax/upstreaminstalllog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Innovation Data Processing UPSTREAMInstall.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:      2013-06-17
diff --git a/uvim/runtime/syntax/upstreamlog.vim b/uvim/runtime/syntax/upstreamlog.mnv
index 1439bdffe6..d78b2cfb17 100644
--- a/uvim/runtime/syntax/upstreamlog.vim
+++ b/uvim/runtime/syntax/upstreamlog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Innovation Data Processing upstream.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:      2013-09-19
diff --git a/uvim/runtime/syntax/upstreamrpt.vim b/uvim/runtime/syntax/upstreamrpt.mnv
index 21c25633a2..7143b9fc27 100644
--- a/uvim/runtime/syntax/upstreamrpt.vim
+++ b/uvim/runtime/syntax/upstreamrpt.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		Innovation Data Processing upstream.rpt file
 " Maintainer:		Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:	2014-03-13
diff --git a/uvim/runtime/syntax/urlshortcut.vim b/uvim/runtime/syntax/urlshortcut.mnv
index f6cc3835a2..9cb2c384fc 100644
--- a/uvim/runtime/syntax/urlshortcut.vim
+++ b/uvim/runtime/syntax/urlshortcut.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      MS Windows URL shortcut file
 " Maintainer:    ObserverOfTime <chronobserver@disroot.org>
 " LastChange:    2023-06-04
@@ -9,6 +9,6 @@ if exists("b:current_syntax")
 endif
 
 " Just use the dosini syntax for now
-runtime! syntax/dosini.vim
+runtime! syntax/dosini.mnv
 
 let b:current_syntax = "urlshortcut"
diff --git a/uvim/runtime/syntax/usserverlog.vim b/uvim/runtime/syntax/usserverlog.mnv
index 34a7e3dca0..df95bfc40f 100644
--- a/uvim/runtime/syntax/usserverlog.vim
+++ b/uvim/runtime/syntax/usserverlog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Innovation Data Processing usserver.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:      2013-09-19
diff --git a/uvim/runtime/syntax/usw2kagtlog.vim b/uvim/runtime/syntax/usw2kagtlog.mnv
index a112340d12..fc84b36983 100644
--- a/uvim/runtime/syntax/usw2kagtlog.vim
+++ b/uvim/runtime/syntax/usw2kagtlog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Innovation Data Processing USW2KAgt.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
 " Latest Revision:      2014-04-01
diff --git a/uvim/runtime/syntax/valgrind.vim b/uvim/runtime/syntax/valgrind.mnv
index a9b4a8c8e7..c4a57530a8 100644
--- a/uvim/runtime/syntax/valgrind.vim
+++ b/uvim/runtime/syntax/valgrind.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Valgrind Memory Debugger Output
 " Maintainer: Roger Luethi <rl@hellgate.ch>
 " Program URL: http://devel-home.kde.org/~sewardj/
 " Last Change: 2019 Jul 24
 "
-" Notes: mostly based on strace.vim and xml.vim
+" Notes: mostly based on strace.mnv and xml.mnv
 "
 " Contributors: Christoph Gysin <christoph.gysin@gmail.com>
 
@@ -13,7 +13,7 @@ if exists("b:current_syntax")
 	finish
 endif
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 " Lines can be long with demangled c++ functions.
 setlocal synmaxcol=8000
diff --git a/uvim/runtime/syntax/vb.vim b/uvim/runtime/syntax/vb.mnv
index 607f6130ba..ae10c4ed60 100644
--- a/uvim/runtime/syntax/vb.vim
+++ b/uvim/runtime/syntax/vb.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Visual Basic
 " Maintainer:   Doug Kearns <dougkearns@gmail.com>
-" Former Maintainer:    Tim Chase <vb.vim@tim.thechases.com>
+" Former Maintainer:    Tim Chase <vb.mnv@tim.thechases.com>
 " Former Maintainer:    Robert M. Cortopassi <cortopar@mindspring.com>
 "       (tried multiple times to contact, but email bounced)
 " Last Change:
@@ -10,7 +10,7 @@
 "   2004 May 30  Added a few keywords
 
 " This was thrown together after seeing numerous requests on the
-" VIM and VIM-DEV mailing lists.  It is by no means complete.
+" MNV and MNV-DEV mailing lists.  It is by no means complete.
 " Send comments, suggestions and requests to the maintainer.
 
 " quit when a syntax file was already loaded
@@ -372,4 +372,4 @@ hi def link vbPreProc           PreProc
 
 let b:current_syntax = "vb"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vdf.vim b/uvim/runtime/syntax/vdf.mnv
index c690b706ea..51affa9dea 100644
--- a/uvim/runtime/syntax/vdf.vim
+++ b/uvim/runtime/syntax/vdf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Valve Data Format
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.vdf
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpoptions
-set cpoptions&vim
+set cpoptions&mnv
 
 " Comment
 syn keyword vdfTodo contained TODO FIXME XXX
diff --git a/uvim/runtime/syntax/vera.vim b/uvim/runtime/syntax/vera.mnv
index b41c0a6cbf..59ec49ef23 100644
--- a/uvim/runtime/syntax/vera.vim
+++ b/uvim/runtime/syntax/vera.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Vera
 " Maintainer:	Dave Eggum (opine at bluebottle dOt com)
 " Last Change:	2005 Dec 19
@@ -345,4 +345,4 @@ hi def link veraCppOut		Comment
 
 let b:current_syntax = "vera"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/verilog.vim b/uvim/runtime/syntax/verilog.mnv
index bbaca491a7..5599f4d0d4 100644
--- a/uvim/runtime/syntax/verilog.vim
+++ b/uvim/runtime/syntax/verilog.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Verilog
 " Maintainer:	Mun Johl <Mun.Johl@emulex.com>
 " Last Update:  Wed Jul 20 16:04:19 PDT 2011
@@ -116,4 +116,4 @@ hi def link verilogEscape		 Special
 
 let b:current_syntax = "verilog"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/verilogams.vim b/uvim/runtime/syntax/verilogams.mnv
index 7551b681a8..cf1bc0a265 100644
--- a/uvim/runtime/syntax/verilogams.vim
+++ b/uvim/runtime/syntax/verilogams.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    Verilog-AMS
 " Maintainer:  S. Myles Prather <smprather@gmail.com>
 "
@@ -129,4 +129,4 @@ hi def link verilogamsSystask      Function
 
 let b:current_syntax = "verilogams"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vgrindefs.vim b/uvim/runtime/syntax/vgrindefs.mnv
index a194c108cb..0b3e2e06c2 100644
--- a/uvim/runtime/syntax/vgrindefs.vim
+++ b/uvim/runtime/syntax/vgrindefs.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Vgrindefs
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Maintainer:	The MNV Project <https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Former Maintainer:	Bram Moolenaar <Bram@mnv.org>
 
 " The Vgrindefs file is used to specify a language for vgrind
 
@@ -43,4 +43,4 @@ hi def link vgrindefsComment	Comment
 
 let b:current_syntax = "vgrindefs"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vhdl.vim b/uvim/runtime/syntax/vhdl.mnv
index 06fc2e795e..e3c5f8ef78 100644
--- a/uvim/runtime/syntax/vhdl.vim
+++ b/uvim/runtime/syntax/vhdl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		VHDL [VHSIC (Very High Speed Integrated Circuit) Hardware Description Language]
 " Maintainer:		Daniel Kho <daniel.kho@logik.haus>
 " Previous Maintainer:	Czo <Olivier.Sirol@lip6.fr>
@@ -11,7 +11,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " case is not significant
 syn case	ignore
@@ -265,4 +265,4 @@ let b:current_syntax = "vhdl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vim.vim b/uvim/runtime/syntax/vim.vim
deleted file mode 100644
index ed7ce5fb0a..0000000000
--- a/uvim/runtime/syntax/vim.vim
+++ /dev/null
@@ -1,2931 +0,0 @@
-" Vim syntax file
-" Language:	   Vim script
-" Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
-"	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2026 Mar 13
-" Former Maintainer: Charles E. Campbell
-
-" DO NOT CHANGE DIRECTLY.
-" THIS FILE PARTLY GENERATED BY gen_syntax_vim.vim.
-" (Search string "GEN_SYN_VIM:" in this file)
-
-" Quit when a syntax file was already loaded {{{1
-if exists("b:current_syntax")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Feature testing {{{1
-
-" NOTE: vimsyn_force_vim9 for internal use only
-let s:vim9script = get(b:, "vimsyn_force_vim9", v:false) || "\n" .. getline(1, 32)->join("\n") =~# '\n\s*vim9\%[script]\>'
-
-function s:has(feature)
-  return has(a:feature) || index(get(g:, "vimsyn_vim_features", []), a:feature) != -1
-endfunction
-
-" Automatically generated keyword lists: {{{1
-
-" vimTodo: contains common special-notices for comments {{{2
-" Use the vimCommentGroup cluster to add your own.
-syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
-syn cluster vimCommentGroup	contains=vimTodo,@Spell
-
-" regular vim commands {{{2
-" GEN_SYN_VIM: vimCommand normal, START_STR='syn keyword vimCommand contained', END_STR='nextgroup=vimBang'
-syn keyword vimCommand contained al[l] ar[gs] arga[dd] argd[elete] argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment] as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bf[irst] bl[ast] bm[odified] bn[ext] bp[revious] br[ewind] brea[k] buffers bun[load] bw[ipeout] cN[ext] cNf[ile] cabo[ve] cad[dbuffer] cadde[xpr] caddf[ile] caf[ter] cb[uffer] cbe[fore] cbel[ow] cbo[ttom] cc ccl[ose] ce[nter] cex[pr] cf[ile] cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] changes che[ckpath] checkt[ime] chi[story] cl[ist] clip[reset] cla[st] clo[se] cle[arjumps] cn[ext] cnew[er] cnf[ile] col[der] colo[rscheme] comc[lear] comp[iler] con[tinue] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] delm[arks] defc[ompile] di[splay] dif[fupdate] diffg[et] diffo[ff] nextgroup=vimBang
-syn keyword vimCommand contained diffp[atch] diffpu[t] diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op] ds[earch] dsp[lit] e[dit] ea[rlier] em[enu] endfo[r] endt[ry] endw[hile] ene[w] ex exi[t] exu[sage] f[ile] files fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldo[pen] g[lobal] go[to] gu[i] gv[im] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] ij[ump] il[ist] int[ro] ip[ut] is[earch] isp[lit] ju[mps] l[ist] lN[ext] lNf[ile] la[st] lab[ove] lad[dexpr] laddb[uffer] laddf[ile] laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lcl[ose] lcs[cope] le[ft] lex[pr] lf[ile] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] lockv[ar] lol[der] lop[en] lp[revious] nextgroup=vimBang
-syn keyword vimCommand contained lpf[ile] lr[ewind] lt[ag] lw[indow] ls m[ove] marks mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] n[ext] nb[key] nbc[lose] nbs[tart] noh[lsearch] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] ped[it] po[p] pp[op] pre[serve] prev[ious] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] redrawtabp[anel] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] ru[ntime] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] scr[iptnames] nextgroup=vimBang
-syn keyword vimCommand contained scripte[ncoding] scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sla[st] sn[ext] so[urce] spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sre[wind] st[op] sta[g] star[tinsert] startg[replace] startr[eplace] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sync[bind] smi[le] t tN[ext] ta[g] tags tabc[lose] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs te[aroff] tf[irst] tj[ump] tl[ast] tn[ext] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] up[date] v[global] ve[rsion] vi[sual] vie[w] viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wi[nsize] nextgroup=vimBang
-syn keyword vimCommand contained winp[os] wl[restore] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp deletep a i nextgroup=vimBang
-
-" Lower priority :syn-match to allow for :command/function() distinction
-" :chdir is handled specially elsewhere
-syn match vimCommand "\<co\%[py]\>"     nextgroup=vimBang
-syn match vimCommand "\<d\%[elete]\>"   nextgroup=vimBang
-syn match vimCommand "\<j\%[oin]\>"     nextgroup=vimBang
-syn match vimCommand "\<sp\%[lit]\>"    nextgroup=vimBang
-syn match vimCommand "\<sw\%[apname]\>" nextgroup=vimBang
-
-" GEN_SYN_VIM: vimCommand modifier, START_STR='syn keyword vimCommandModifier', END_STR='skipwhite nextgroup=vimCommandModifierBang,@vimCmdList'
-syn keyword vimCommandModifier abo[veleft] bel[owright] bo[tright] hid[e] hor[izontal] kee[pmarks] keepj[umps] keepp[atterns] keepa[lt] lefta[bove] leg[acy] loc[kmarks] noa[utocmd] nos[wapfile] rightb[elow] san[dbox] sil[ent] tab to[pleft] uns[ilent] verb[ose] vert[ical] vim9[cmd] skipwhite nextgroup=vimCommandModifierBang,@vimCmdList
-" :filter is handled specially elsewhere
-syn match	vimCommandModifierBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimCmdList
-
-" Lower priority :syn-match to allow for :command/function() distinction
-syn match vimCommand "\<bro\%[wse]\>"  skipwhite nextgroup=vimCommandModifierBang,@vimCmdList
-syn match vimCommand "\<conf\%[irm]\>" skipwhite nextgroup=vimCommandModifierBang,@vimCmdList
-
-" Lower priority for _new_ to distinguish constructors from the command.
-syn match   vimCommand contained	"\<new\>(\@!"
-syn match   vimCommand contained	"\<z[-+^.=]\=\>"
-syn keyword vimStdPlugin contained	Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man Over Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Until Winbar XMLent XMLns
-
-" vimOptions are caught only when contained in a vimSet {{{2
-" GEN_SYN_VIM: vimOption normal, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod'
-syn keyword vimOption contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete acl autocompletedelay act autocompletetimeout ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained co columns com comments cms commentstring cp compatible cpt complete cfu completefunc cia completeitemalign cot completeopt cpp completepopup csl completeslash cto completetimeout cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained efm errorformat ek esckeys ei eventignore eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained mmd maxmapdepth mm maxmem mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc ost osctimeoutlen pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline stlo statuslineopt su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors trz termresize skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained tsy termsync twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes skipwhite nextgroup=vimSetEqual,vimSetMod
-
-" vimOptions: These are the turn-off setting variants {{{2
-" GEN_SYN_VIM: vimOption turn-off, START_STR='syn keyword vimOption contained', END_STR=''
-syn keyword vimOption contained noari noallowrevins noarab noarabic noarshape noarabicshape noacd noautochdir noac noautocomplete noai noautoindent noar noautoread noasd noautoshelldir noaw noautowrite noawa noautowriteall nobk nobackup nobeval noballooneval nobevalterm noballoonevalterm nobin nobinary nobomb nobri nobreakindent nobl nobuflisted nocdh nocdhome nocin nocindent nocp nocompatible nocf noconfirm noci nocopyindent nocsre nocscoperelative nocst nocscopetag nocsverb nocscopeverbose nocrb nocursorbind nocuc nocursorcolumn nocul nocursorline nodeco nodelcombine nodiff nodg nodigraph noed noedcompatible noemo noemoji noeof noendoffile noeol noendofline noea noequalalways noeb noerrorbells noek noesckeys noet noexpandtab noex noexrc nofic nofileignorecase
-syn keyword vimOption contained nofixeol nofixendofline nofen nofoldenable nofs nofsync nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkp nohkmapp nohls nohlsearch noicon noic noignorecase noimc noimcmdline noimd noimdisable nois noincsearch noinf noinfercase noim noinsertmode nojs nojoinspaces nolnr nolangnoremap nolrm nolangremap nolz nolazyredraw nolbr nolinebreak nolisp nolist nolpl noloadplugins nomagic noml nomodeline nomle nomodelineexpr noma nomodifiable nomod nomodified nomore nomousef nomousefocus nomh nomousehide nomousemev nomousemoveevent nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopvw nopreviewwindow noprompt noro noreadonly nornu norelativenumber noremap nors norestorescreen nori norevins norl norightleft noru noruler
-syn keyword vimOption contained noscb noscrollbind noscf noscrollfocus nosecure nossl noshellslash nostmp noshelltemp nosr noshiftround nosn noshortname nosc noshowcmd nosft noshowfulltag nosm noshowmatch nosmd noshowmode noscs nosmartcase nosi nosmartindent nosta nosmarttab nosms nosmoothscroll nospell nosb nosplitbelow nospr nosplitright nosol nostartofline noswf noswapfile notbs notagbsearch notr notagrelative notgst notagstack notbidi notermbidi notgc notermguicolors notsy notermsync noterse nota notextauto notx notextmode notop notildeop noto notimeout notitle nottimeout notbi nottybuiltin notf nottyfast noudf noundofile novb novisualbell nowarn nowiv noweirdinvert nowic nowildignorecase nowmnu nowildmenu nowfb nowinfixbuf nowfh nowinfixheight nowfw nowinfixwidth
-syn keyword vimOption contained nowst nowlsteal nowrap nows nowrapscan nowrite nowa nowriteany nowb nowritebackup noxtermcodes
-
-" vimOptions: These are the invertible variants {{{2
-" GEN_SYN_VIM: vimOption invertible, START_STR='syn keyword vimOption contained', END_STR=''
-syn keyword vimOption contained invari invallowrevins invarab invarabic invarshape invarabicshape invacd invautochdir invac invautocomplete invai invautoindent invar invautoread invasd invautoshelldir invaw invautowrite invawa invautowriteall invbk invbackup invbeval invballooneval invbevalterm invballoonevalterm invbin invbinary invbomb invbri invbreakindent invbl invbuflisted invcdh invcdhome invcin invcindent invcp invcompatible invcf invconfirm invci invcopyindent invcsre invcscoperelative invcst invcscopetag invcsverb invcscopeverbose invcrb invcursorbind invcuc invcursorcolumn invcul invcursorline invdeco invdelcombine invdiff invdg invdigraph inved invedcompatible invemo invemoji inveof invendoffile inveol invendofline invea invequalalways inveb inverrorbells
-syn keyword vimOption contained invek invesckeys invet invexpandtab invex invexrc invfic invfileignorecase invfixeol invfixendofline invfen invfoldenable invfs invfsync invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkp invhkmapp invhls invhlsearch invicon invic invignorecase invimc invimcmdline invimd invimdisable invis invincsearch invinf invinfercase invim invinsertmode invjs invjoinspaces invlnr invlangnoremap invlrm invlangremap invlz invlazyredraw invlbr invlinebreak invlisp invlist invlpl invloadplugins invmagic invml invmodeline invmle invmodelineexpr invma invmodifiable invmod invmodified invmore invmousef invmousefocus invmh invmousehide invmousemev invmousemoveevent invnu invnumber invodev invopendevice invpaste invpi invpreserveindent
-syn keyword vimOption contained invpvw invpreviewwindow invprompt invro invreadonly invrnu invrelativenumber invremap invrs invrestorescreen invri invrevins invrl invrightleft invru invruler invscb invscrollbind invscf invscrollfocus invsecure invssl invshellslash invstmp invshelltemp invsr invshiftround invsn invshortname invsc invshowcmd invsft invshowfulltag invsm invshowmatch invsmd invshowmode invscs invsmartcase invsi invsmartindent invsta invsmarttab invsms invsmoothscroll invspell invsb invsplitbelow invspr invsplitright invsol invstartofline invswf invswapfile invtbs invtagbsearch invtr invtagrelative invtgst invtagstack invtbidi invtermbidi invtgc invtermguicolors invtsy invtermsync invterse invta invtextauto invtx invtextmode invtop invtildeop invto invtimeout
-syn keyword vimOption contained invtitle invttimeout invtbi invttybuiltin invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwst invwlsteal invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes
-" termcap codes (which can also be set) {{{2
-" GEN_SYN_VIM: vimOption term output code, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod'
-syn keyword vimOption contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo t_BS t_ES skipwhite nextgroup=vimSetEqual,vimSetMod
-" term key codes
-syn keyword vimOption contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
-syn match   vimOption contained	"t_%1"
-syn match   vimOption contained	"t_#2"
-syn match   vimOption contained	"t_#4"
-syn match   vimOption contained	"t_@7"
-syn match   vimOption contained	"t_*7"
-syn match   vimOption contained	"t_&8"
-syn match   vimOption contained	"t_%i"
-syn match   vimOption contained	"t_k;"
-
-" vimOptions: These are the variable names {{{2
-" GEN_SYN_VIM: vimOption normal variable,           START_STR='syn keyword vimOptionVarName contained', END_STR=''
-syn keyword vimOptionVarName contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete acl autocompletedelay act autocompletetimeout ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn
-syn keyword vimOptionVarName contained co columns com comments cms commentstring cp compatible cpt complete cfu completefunc cia completeitemalign cot completeopt cpp completepopup csl completeslash cto completetimeout cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile
-syn keyword vimOptionVarName contained efm errorformat ek esckeys ei eventignore eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight
-syn keyword vimOptionVarName contained hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine
-syn keyword vimOptionVarName contained mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc ost osctimeoutlen pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset
-syn keyword vimOptionVarName contained pmbfn printmbfont popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess
-syn keyword vimOptionVarName contained sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline stlo statuslineopt su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding
-syn keyword vimOptionVarName contained tgc termguicolors trz termresize tsy termsync twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode
-syn keyword vimOptionVarName contained wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes
-" GEN_SYN_VIM: vimOption term output code variable, START_STR='syn keyword vimOptionVarName contained', END_STR=''
-syn keyword vimOptionVarName contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo t_BS t_ES
-syn keyword vimOptionVarName contained	t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
-syn match   vimOptionVarName contained	"t_%1"
-syn match   vimOptionVarName contained	"t_#2"
-syn match   vimOptionVarName contained	"t_#4"
-syn match   vimOptionVarName contained	"t_@7"
-syn match   vimOptionVarName contained	"t_*7"
-syn match   vimOptionVarName contained	"t_&8"
-syn match   vimOptionVarName contained	"t_%i"
-syn match   vimOptionVarName contained	"t_k;"
-
-" unsupported settings: some were supported by vi but don't do anything in vim {{{2
-" GEN_SYN_VIM: Missing vimOption, START_STR='syn keyword vimErrSetting contained', END_STR=''
-syn keyword vimErrSetting contained akm altkeymap anti antialias ap autoprint bf beautify biosk bioskey consk conskey fk fkmap fl flash gr graphic ht hardtabs macatsui mesg novice open opt optimize oft osfiletype redraw slow slowopen sourceany w1200 w300 w9600
-syn keyword vimErrSetting contained noakm noaltkeymap noanti noantialias noap noautoprint nobf nobeautify nobiosk nobioskey noconsk noconskey nofk nofkmap nofl noflash nogr nographic nomacatsui nomesg nonovice noopen noopt nooptimize noredraw noslow noslowopen nosourceany
-syn keyword vimErrSetting contained invakm invaltkeymap invanti invantialias invap invautoprint invbf invbeautify invbiosk invbioskey invconsk invconskey invfk invfkmap invfl invflash invgr invgraphic invmacatsui invmesg invnovice invopen invopt invoptimize invredraw invslow invslowopen invsourceany
-
-" AutoCmd Events {{{2
-syn case ignore
-" GEN_SYN_VIM: vimAutoEvent, START_STR='syn keyword vimAutoEvent contained', END_STR='skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern'
-syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdlineLeavePre CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedC CursorMovedI DiffUpdated DirChanged DirChangedPre EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern
-syn keyword vimAutoEvent contained FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave InsertLeavePre KeyInputPre MenuPopup ModeChanged OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost SessionLoadPre SessionWritePost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabClosedPre TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TermResponseAll TextChanged TextChangedI TextChangedP TextChangedT TextYankPost VimEnter VimLeave VimLeavePre VimResized VimResume VimSuspend WinClosed WinEnter WinLeave WinNew WinNewPre skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern
-syn keyword vimAutoEvent contained WinResized WinScrolled skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern
-
-syn keyword	vimAutoEvent	contained	User	skipwhite nextgroup=vimUserAutoEvent
-syn match	vimUserAutoEvent	contained	"\<\h\w*\>"	skipwhite nextgroup=vimUserAutoEventSep,vimAutocmdMod,vimAutocmdBlock
-
-" Highlight commonly used Groupnames {{{2
-" GEN_SYN_VIM: vimGroup, START_STR='syn keyword vimGroup contained', END_STR=''
-syn keyword vimGroup contained Added Bold BoldItalic Boolean Changed Character Comment Conditional Constant Debug Define Delimiter Error Exception Float Function Identifier Ignore Include Italic Keyword Label Macro Number Operator PreCondit PreProc Removed Repeat Special SpecialChar SpecialComment Statement StorageClass String Structure Tag Todo Type Typedef Underlined
-
-" Default highlighting groups {{{2
-" GEN_SYN_VIM: vimHLGroup, START_STR='syn keyword vimHLGroup contained', END_STR=''
-syn keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit VisualNOS DiffText DiffTextAdd PmenuSbar TabLineSel TabLineFill TabPanel TabPanelSel TabPanelFill Cursor lCursor TitleBar TitleBarNC QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel PmenuBorder PopupSelected MessageWindow PopupNotification PreInsert Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb PmenuShadow Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen StatusLineTerm StatusLineTermNC ToolbarLine
-syn keyword vimHLGroup contained ToolbarButton TitleBar TitleBarNC Menu Tooltip Scrollbar CursorIM ComplMatchIns LineNrAbove LineNrBelow MsgArea Terminal User1 User2 User3 User4 User5 User6 User7 User8 User9
-syn match vimHLGroup contained "\<Conceal\>"
-syn case match
-
-" Function Names {{{2
-" GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained', END_STR=''
-syn keyword vimFuncName contained abs acos add and append appendbufline argc argidx arglistid argv asin assert_beeps assert_equal assert_equalfile assert_exception assert_fails assert_false assert_inrange assert_match assert_nobeep assert_notequal assert_notmatch assert_report assert_true atan atan2 autocmd_add autocmd_delete autocmd_get balloon_gettext balloon_show balloon_split base64_decode base64_encode bindtextdomain blob2list blob2str browse browsedir bufadd bufexists buflisted bufload bufloaded bufname bufnr bufwinid bufwinnr byte2line byteidx byteidxcomp call ceil ch_canread ch_close ch_close_in ch_evalexpr ch_evalraw ch_getbufnr ch_getjob ch_info ch_listen ch_log ch_logfile ch_open ch_read ch_readblob ch_readraw ch_sendexpr ch_sendraw ch_setoptions ch_status
-syn keyword vimFuncName contained changenr char2nr charclass charcol charidx chdir cindent clearmatches cmdcomplete_info col complete complete_add complete_check complete_info confirm copy cos cosh count cscope_connection cursor debugbreak deepcopy delete deletebufline did_filetype diff diff_filler diff_hlID digraph_get digraph_getlist digraph_set digraph_setlist echoraw empty environ err_teapot escape eval eventhandler executable execute exepath exists exists_compiled exp expand expandcmd extend extendnew feedkeys filecopy filereadable filewritable filter finddir findfile flatten flattennew float2nr floor fmod fnameescape fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreach foreground fullcommand funcref function garbagecollect get getbufinfo
-syn keyword vimFuncName contained getbufline getbufoneline getbufvar getcellpixels getcellwidths getchangelist getchar getcharmod getcharpos getcharsearch getcharstr getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt getcmdscreenpos getcmdtype getcmdwintype getcompletion getcompletiontype getcurpos getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos getregtype getscriptinfo getstacktrace gettabinfo gettabvar gettabwinvar gettagstack gettext getwininfo getwinpos getwinposx getwinposy getwinvar glob glob2regpat globpath has has_key haslocaldir hasmapto histadd histdel
-syn keyword vimFuncName contained histget histnr hlID hlexists hlget hlset hostname iconv id indent index indexof input inputdialog inputlist inputrestore inputsave inputsecret insert instanceof interrupt invert isabsolutepath isdirectory isinf islocked isnan items job_getchannel job_info job_setoptions job_start job_status job_stop join js_decode js_encode json_decode json_encode keys keytrans len libcall libcallnr line line2byte lispindent list2blob list2str list2tuple listener_add listener_flush listener_remove localtime log log10 luaeval map maparg mapcheck maplist mapnew mapset match matchadd matchaddpos matcharg matchbufline matchdelete matchend matchfuzzy matchfuzzypos matchlist matchstr matchstrlist matchstrpos max menu_info min mkdir mode mzeval nextnonblank
-syn keyword vimFuncName contained ngettext nr2char or pathshorten perleval popup_atcursor popup_beval popup_clear popup_close popup_create popup_dialog popup_filter_menu popup_filter_yesno popup_findecho popup_findinfo popup_findpreview popup_getoptions popup_getpos popup_hide popup_list popup_locate popup_menu popup_move popup_notification popup_setbuf popup_setoptions popup_settext popup_show pow preinserted prevnonblank printf prompt_getprompt prompt_setcallback prompt_setinterrupt prompt_setprompt prop_add prop_add_list prop_clear prop_find prop_list prop_remove prop_type_add prop_type_change prop_type_delete prop_type_get prop_type_list pum_getpos pumvisible py3eval pyeval pyxeval rand range readblob readdir readdirex readfile redraw_listener_add redraw_listener_remove
-syn keyword vimFuncName contained reduce reg_executing reg_recording reltime reltimefloat reltimestr remote_expr remote_foreground remote_peek remote_read remote_send remote_startserver remove rename repeat resolve reverse round rubyeval screenattr screenchar screenchars screencol screenpos screenrow screenstring search searchcount searchdecl searchpair searchpairpos searchpos server2client serverlist setbufline setbufvar setcellwidths setcharpos setcharsearch setcmdline setcmdpos setcursorcharpos setenv setfperm setline setloclist setmatches setpos setqflist setreg settabvar settabwinvar settagstack setwinvar sha256 shellescape shiftwidth sign_define sign_getdefined sign_getplaced sign_jump sign_place sign_placelist sign_undefine sign_unplace sign_unplacelist
-syn keyword vimFuncName contained simplify sin sinh slice sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus term_gettitle term_gettty term_list term_scrape
-syn keyword vimFuncName contained term_sendkeys term_setansicolors term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq uri_decode uri_encode utf16idx values virtcol virtcol2col
-syn keyword vimFuncName contained visualmode wildmenumode wildtrigger win_execute win_findbuf win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
-
-" Predefined variable names {{{2
-" GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR=''
-syn keyword vimVimVarName contained count count1 prevcount errmsg warningmsg statusmsg shell_error this_session version lnum termresponse fname lang lc_time ctype charconvert_from charconvert_to fname_in fname_out fname_new fname_diff cmdarg foldstart foldend folddashes foldlevel progname servername dying exception throwpoint register cmdbang insertmode val key profiling fcs_reason fcs_choice beval_bufnr beval_winnr beval_winid beval_lnum beval_col beval_text scrollstart swapname swapchoice swapcommand char mouse_win mouse_winid mouse_lnum mouse_col operator searchforward hlsearch oldfiles windowid progpath completed_item option_new option_old option_oldlocal option_oldglobal option_command option_type errors false true none null numbermax numbermin numbersize
-syn keyword vimVimVarName contained vim_did_enter testing t_number t_string t_func t_list t_dict t_float t_bool t_none t_job t_channel t_blob t_class t_object termrfgresp termrbgresp termu7resp termstyleresp termblinkresp event versionlong echospace argv collate exiting colornames sizeofint sizeoflong sizeofpointer maxcol python3_version t_typealias t_enum t_enumvalue stacktrace t_tuple wayland_display clipmethod termda1 termosc vim_did_init clipproviders
-
-"--- syntax here and above generated by runtime/syntax/generator/gen_syntax_vim.vim ---
-
-" Special Vim Highlighting (not automatic) {{{1
-
-" Neovim keyword list additions {{{2
-
-if s:has("nvim")
-  syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
-  syn keyword vimFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
-  syn match   vimFuncName      contained "\<nvim_\w\+\>"
-  syn keyword vimVimVarName    contained lua msgpack_types relnum stderr termrequest virtnum
-endif
-
-" Set up commands for this syntax highlighting file {{{2
-
-com! -nargs=* Vim9 execute <q-args> s:vim9script ? "" : "contained"
-com! -nargs=* VimL execute <q-args> s:vim9script ? "contained" : ""
-
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[acefhiHlmpPrt]'
- if g:vimsyn_folding =~# 'a'
-  com! -nargs=* VimFolda <args> fold
- else
-  com! -nargs=* VimFolda <args>
- endif
- if g:vimsyn_folding =~# 'c'
-  com! -nargs=* VimFoldc <args> fold
- else
-  com! -nargs=* VimFoldc <args>
- endif
- if g:vimsyn_folding =~# 'e'
-  com! -nargs=* VimFolde <args> fold
- else
-  com! -nargs=* VimFolde <args>
- endif
- if g:vimsyn_folding =~# 'f'
-  com! -nargs=* VimFoldf <args> fold
- else
-  com! -nargs=* VimFoldf <args>
- endif
- if g:vimsyn_folding =~# 'h'
-  com! -nargs=* VimFoldh <args> fold
- else
-  com! -nargs=* VimFoldh <args>
- endif
- if g:vimsyn_folding =~# 'H'
-  com! -nargs=* VimFoldH <args> fold
- else
-  com! -nargs=* VimFoldH <args>
- endif
- if g:vimsyn_folding =~# 'i'
-  com! -nargs=* VimFoldi <args> fold
- else
-  com! -nargs=* VimFoldi <args>
- endif
- if g:vimsyn_folding =~# 'l'
-  com! -nargs=* VimFoldl <args> fold
- else
-  com! -nargs=* VimFoldl <args>
- endif
- if g:vimsyn_folding =~# 'm'
-  com! -nargs=* VimFoldm <args> fold
- else
-  com! -nargs=* VimFoldm <args>
- endif
- if g:vimsyn_folding =~# 'p'
-  com! -nargs=* VimFoldp <args> fold
- else
-  com! -nargs=* VimFoldp <args>
- endif
- if g:vimsyn_folding =~# 'P'
-  com! -nargs=* VimFoldP <args> fold
- else
-  com! -nargs=* VimFoldP <args>
- endif
- if g:vimsyn_folding =~# 'r'
-  com! -nargs=* VimFoldr <args> fold
- else
-  com! -nargs=* VimFoldr <args>
- endif
- if g:vimsyn_folding =~# 't'
-  com! -nargs=* VimFoldt <args> fold
- else
-  com! -nargs=* VimFoldt <args>
- endif
-else
- com! -nargs=*	VimFolda	<args>
- com! -nargs=*	VimFoldc	<args>
- com! -nargs=*	VimFolde	<args>
- com! -nargs=*	VimFoldf	<args>
- com! -nargs=*	VimFoldi	<args>
- com! -nargs=*	VimFoldh	<args>
- com! -nargs=*	VimFoldH	<args>
- com! -nargs=*	VimFoldl	<args>
- com! -nargs=*	VimFoldm	<args>
- com! -nargs=*	VimFoldp	<args>
- com! -nargs=*	VimFoldP	<args>
- com! -nargs=*	VimFoldr	<args>
- com! -nargs=*	VimFoldt	<args>
-endif
-
-" Deprecated variable options {{{2
-if exists("g:vim_minlines")
- let g:vimsyn_minlines= g:vim_minlines
-endif
-if exists("g:vim_maxlines")
- let g:vimsyn_maxlines= g:vim_maxlines
-endif
-if exists("g:vimsyntax_noerror")
- let g:vimsyn_noerror= g:vimsyntax_noerror
-endif
-
-" Nulls {{{2
-" =====
-Vim9 syn keyword  vim9Null	null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string null_tuple
-
-" Booleans {{{2
-" ========
-Vim9 syn keyword vim9Boolean	true false
-
-" Numbers {{{2
-" =======
-syn case ignore
-syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
-syn match	vimNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@vimComment
-syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	'\<0z\>'			skipwhite nextgroup=@vimComment
-syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscript
-syn case match
-
-" All vimCommands are contained by vimIsCommand. {{{2
-syn cluster vimCmdList	contains=vimAbb,vimAddress,vimAt,vimAutocmd,vimAugroup,vimBehave,vimBreakadd,vimBreakdel,vimBreaklist,vimCall,vimCatch,vimCd,vimCommandModifier,vimConst,vimDoautocmd,vimDebug,vimDebuggreedy,vimDef,vimDefFold,vimDefer,vimDelcommand,vimDelFunction,vimDoCommand,@vimEcho,vimElse,vimEnddef,vimEndfunction,vimEndif,vimEval,vimExecute,vimIsCommand,vimExtCmd,vimExFilter,vimExMark,vimFiletype,vimFor,vimFunction,vimFunctionFold,vimGrep,vimGrepAdd,vimGlobal,vimHelp,vimHelpgrep,vimHighlight,vimHistory,vimImport,vimLanguage,vimLet,vimLoadkeymap,vimLockvar,vimMake,vimMap,vimMark,vimMatch,vimNotFunc,vimNormal,vimProfdel,vimProfile,vimPrompt,vimRedir,vimSet,vimSleep,vimSort,vimSyntax,vimSyntime,vimSynColor,vimSynLink,vimTerminal,vimThrow,vimUniq,vimUnlet,vimUnlockvar,vimUnmap,vimUserCmd,vimVimgrep,vimVimgrepadd,vimWincmd,vimMenu,vimMenutranslate,@vim9CmdList,@vimExUserCmdList,vimLua,vimMzScheme,vimPerl,vimPython,vimPython3,vimPythonX,vimRuby,vimTcl
-syn cluster vim9CmdList	contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9Export,vim9Final,vim9For,vim9Interface,vim9Type,vim9Var
-syn match vimCmdSep	"\\\@1<!|"	skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
-syn match vimCmdSep	":\+"	skipwhite nextgroup=@vimCmdList,vimSubst1
-syn match vimCount	contained	"\d\+"
-syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
-syn match vimBang	      contained	"!"
-syn match vimWhitespace contained	"\s\+"
-
-syn region vimSubscript contained	matchgroup=vimSubscriptBracket start="\[" end="]" nextgroup=vimSubscript contains=@vimExprList
-
-syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vim9Super,vim9This
-syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-
-" match the scope prefix independently of the retrofitted scope dictionary
-syn match vimVarScope   contained	"\<[bwglstav]:"
-syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscript
-
-syn match vimVarNameError contained "\<\h\w*\>"
-syn match vimVimVar	"\<v:"		nextgroup=vimSubscript,vimVimVarName,vimVarNameError
-syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscript,vimOptionVarName,vimVarNameError
-syn cluster vimSpecialVar	contains=vimEnvvar,vimLetRegister,vimOptionVar,vimVimVar
-
-Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
-
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
-Vim9 syn match	vim9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=vimLetHeredoc	contains=vimVarScope
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscript
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimOper	contains=vim9Super,vim9This
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=vim9Super,vim9This
-
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=vimVar,@vimSpecialVar
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+=<<"	skipwhite nextgroup=vimLetHeredoc	contains=vimVar,@vimSpecialVar
-Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+\.\.="			contains=vimVar,@vimSpecialVar
-
-Vim9 syn match vim9LhsRegister	"@["0-9\-a-zA-Z#=*+_/]\ze\s\+\%(\.\.\)\=="
-
-syn cluster vimExprList	contains=@vimSpecialVar,@vimFunc,vimNumber,vimOper,vimOperParen,vimLambda,vimString,vimVar,@vim9ExprList
-syn cluster vim9ExprList	contains=vim9Boolean,vim9LambdaParams,vim9Null
-
-" Insertions And Appends: insert append {{{2
-"   (buftype != nofile test avoids having append, change, insert show up in the command window)
-" =======================
-if &buftype != 'nofile'
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=vimCommand end="^\.$" extend
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=vimCommand end="^\.$" extend
- syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=vimCommand end="^\.$" extend
-endif
-
-" Behave! {{{2
-" =======
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nobehaveerror")
- syn match   vimBehaveError contained	"[^ ]\+"
-endif
-syn match   vimBehave	"\<be\%[have]\>"	nextgroup=vimBehaveBang,vimBehaveModel,vimBehaveError skipwhite
-syn match   vimBehaveBang	contained	"\a\@1<=!" nextgroup=vimBehaveModel skipwhite
-syn keyword vimBehaveModel	contained	mswin	xterm
-
-" Break* commands {{{2
-" ===============
-syn keyword	vimBreakaddFunc	contained	func	skipwhite nextgroup=vimBreakpointFunctionLine,vimBreakpointFunction
-syn keyword	vimBreakaddFile	contained	file	skipwhite nextgroup=vimBreakpointFileLine,vimBreakpointFilename
-syn keyword	vimBreakaddHere	contained	here	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn keyword	vimBreakaddExpr	contained	expr	skipwhite nextgroup=@vimExprList
-
-syn match	vimBreakpointGlob		contained	"*"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointNumber	contained	"\<\d\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-
-syn cluster vimBreakpointArg contains=vimBreakaddFunc,vimBreakaddFile,vimBreakaddHere,vimBreakaddExpr
-
-syn match	vimBreakpointFunction	contained	"\<\%(\*\|\w\)\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointFilename	contained	"\<\%(\*\|\f\)\+\>"	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-syn match	vimBreakpointFunctionLine	contained	"\<\d\+\>"		skipwhite nextgroup=vimBreakpointFunction
-syn match	vimBreakpointFileLine	contained	"\<\d\+\>"		skipwhite nextgroup=vimBreakpointFilename
-
-syn keyword	vimBreakadd	breaka[dd]	skipwhite nextgroup=@vimBreakpointArg
-syn keyword	vimBreakdel	breakd[el]	skipwhite nextgroup=@vimBreakpointArg,vimBreakpointNumber,vimBreakpointGlob
-syn keyword	vimBreaklist	breakl[ist]	skipwhite nextgroup=vimComment,vim9Comment,vimSep
-
-" Call {{{2
-" ====
-syn match vimCall	"\<call\=\>"	skipwhite nextgroup=vimVar,@vimFunc
-
-" Cd: {{{2
-" ==
-" GEN_SYN_VIM: vimCommand cd, START_STR='syn keyword vimCd', END_STR='skipwhite nextgroup=vimCdBang,vimCdArg,vimComment,vim9Comment,vimCmdSep'
-syn keyword vimCd cd lc[d] lch[dir] tc[d] tch[dir] skipwhite nextgroup=vimCdBang,vimCdArg,vimComment,vim9Comment,vimCmdSep
-syn match	vimCd	"\<chd\%[ir]\>"	skipwhite nextgroup=vimCdBang,vimCdArg,vimComment,vim9Comment,vimCmdSep
-syn region	vimCdArg	contained
-      \ start=+["#|]\@!\S+
-      \ end="\ze\s*$"
-      \ end=+\ze\s*\\\@1<!["#|]+
-      \ skipwhite nextgroup=vimComment,vim9Comment,vimCmdSep
-      \ contains=vimSpecfile,@vimWildCard
-      \ oneline
-
-syn match	vimCdBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimCdArg,vimComment,vim9Comment,vimCmdSep
-
-" Debug {{{2
-" =====
-syn keyword	vimDebug	deb[ug]	skipwhite nextgroup=@vimCmdList
-
-" Debuggreedy {{{2
-" ===========
-" TODO: special-cased until generalised range/count support is implemented
-syn match	vimDebuggreedy	"\<0\=debugg\%[reedy]\>" contains=vimCount
-
-" Defer {{{2
-" =====
-syn match	vimDefer	"\<defer\=\>"	skipwhite nextgroup=@vimFunc,vim9LambdaParams
-
-" *Do commands {{{2
-" ============
-syn match	vimDoCommandBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimCmdList
-
-syn keyword	vimDoCommand	argdo bufd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	tabd[o] wind[o]		skipwhite nextgroup=@vimCmdList
-syn keyword	vimDoCommand	cdo cfd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	ld[o] lfd[o]		skipwhite nextgroup=vimDoCommandBang,@vimCmdList
-syn keyword	vimDoCommand	foldd[oopen] folddoc[losed]	skipwhite nextgroup=@vimCmdList
-
-" Exception Handling {{{2
-syn keyword	vimThrow	th[row]	skipwhite nextgroup=@vimExprList
-syn keyword	vimCatch	cat[ch]	skipwhite nextgroup=vimCatchPattern
-syn region	vimCatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@vimSubstList oneline
-
-" Export {{{2
-" ======
-if s:vim9script
-  syn keyword	vim9Export	export	skipwhite nextgroup=vim9Abstract,vim9ClassBody,vim9Const,vim9Def,vim9EnumBody,vim9Final,vim9InterfaceBody,vim9Type,vim9Var
-endif
-
-" Filetypes {{{2
-" =========
-syn match   vimFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=vimFTCmd,vimFTOption,vimFTError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimFTError")
- syn match   vimFTError  contained	"\I\i*"
-endif
-syn keyword vimFTCmd    contained	filet[ype]
-syn keyword vimFTOption contained	detect indent off on plugin
-
-" History {{{2
-" =======
-" TODO: handle Vim9 "history" variable assignment (like :wincmd, but a common variable name)
-syn keyword	vimHistory	his[tory]	skipwhite nextgroup=vimHistoryName,vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn keyword	vimHistoryName	contained	c[md] s[earch] e[xpr] i[nput] d[ebug] a[ll]	skipwhite nextgroup=vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryName	contained	"[:/?=@>]"			skipwhite nextgroup=vimHistoryRange,vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	"-\=\<\d\+\>\%(\s*,\)\="		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	",\s*-\=\d\+\>"			skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimHistoryRange	contained	"-\=\<\d\+\s*,\s*-\=\d\+\>"		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" Import {{{2
-" ======
-syn keyword	vimImportAutoload	contained	autoload	skipwhite nextgroup=vimImportFilename
-if s:vim9script
-  syn region	vimImportFilename contained
-        \ start="\S"
-        \ skip=+\%#=1
-          "\ continuation operators at SOL
-          \\n\%(\s*#.*\n\)*\s*\%([[:punct:]]\+\&[^#"'(]\)
-            \\|
-          "\ continuation operators at EOL
-          \\%(\%([[:punct:]]\+\&[^#"')]\)\s*\%(#.*\)\=\)\@<=$
-            \\|
-          \\n\%(\s*#.*\n\)*\s*as\s
-            \\|
-          \\%(^\s*#.*\)\@<=$
-            \\|
-          \\n\s*\%(\\\|#\\ \)
-        \+
-        \ matchgroup=vimCommand
-        \ end="\s\+\zsas\ze\s\+\h"
-        \ matchgroup=NONE
-        \ end="$"
-        \ skipwhite nextgroup=vimImportName
-        \ contains=@vim9Continue,@vimExprList,vim9Comment
-        \ transparent
-else
-  syn region	vimImportFilename contained
-        \ start="\S"
-        \ skip=+\n\s*\%(\\\|"\\ \)+
-        \ matchgroup=vimCommand
-        \ end="\s\+\zsas\ze\s\+\h"
-        \ matchgroup=NONE
-        \ end="$"
-        \ skipwhite nextgroup=vimImportName
-        \ contains=@vimContinue,@vimExprList
-        \ transparent
-endif
-syn match	vimImportName	contained	"\%(\<as\s\+\)\@<=\h\w*\>"	skipwhite nextgroup=@vimComment
-syn match	vimImport		"\<imp\%[ort]\>"		skipwhite nextgroup=vimImportAutoload,vimImportFilename
-
-" Language {{{2
-" ========
-syn keyword 	vimLanguage		lan[guage]	skipwhite nextgroup=@vimLanguageName,vimLanguageCategory,vimSep,vimComment,vim9Comment
-syn keyword	vimLanguageCategory	contained	col[late] cty[pe] mes[sages] tim[e]	skipwhite nextgroup=@vimLanguageName
-
-" [language[_territory][.codeset][@modifier]] and the reserved "C" and "POSIX"
-syn match	vimLanguageName		contained	"[[:alnum:]][[:alnum:]._@-]*[[:alnum:]]"	nextgroup=vimSep,vimComment,vim9Comment
-syn keyword	vimLanguageNameReserved	contained	C POSIX			nextgroup=vimSep,vimComment,vim9Comment
-syn cluster	vimLanguageName	contains=vimLanguageName,vimLanguageNameReserved
-
-" Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
-" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
-syn cluster vimAugroupList	contains=@vimCmdList,vimFilter,@vimFunc,vimLineComment,vimSpecFile,vimOper,vimNumber,vimOperParen,@vimComment,vimString,vimSubst,vimRegister,vimCmplxRepeat,vimNotation,vimCtrlChar,vimContinue
-
-" define
-VimFolda syn region vimAugroup
-      \ start="\<aug\%[roup]\>\ze\s\+\%([eE][nN][dD]\%($\|[[:space:]|"#]\)\)\@!\S"
-      \ matchgroup=vimAugroupKey
-      \ end="\<aug\%[roup]\ze\s\+[eE][nN][dD]\s*\%($\|[|"#]\)"
-      \ skipwhite nextgroup=vimAugroupEnd
-      \ contains=vimAutocmd,@vimAugroupList,vimAugroupkey
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noaugrouperror")
-  syn match	vimAugroupError	"\<aug\%[roup]\s\+[eE][nN][dD]\ze\s*\%($\|[|"#]\)"
-endif
-
-" TODO: Vim9 comment
-syn match	vimAugroupName	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+"
-      \                                                                 skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimAugroupEnd	contained	"\c\<END\>"	skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimAugroupBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimAugroupName
-syn keyword	vimAugroupKey	contained	aug[roup] 	skipwhite nextgroup=vimAugroupBang,vimAugroupName,vimAugroupEnd
-
-" remove
-syn match	vimAugroup	"\<aug\%[roup]!"		skipwhite nextgroup=vimAugroupName contains=vimAugroupKey,vimAugroupBang
-
-" list
-VimL syn match	vimAugroup	"\<aug\%[roup]\>\ze\s*\%(["|]\|$\)"	skipwhite nextgroup=vimCmdSep,vimComment  contains=vimAugroupKey
-Vim9 syn match 	vimAugroup	"\<aug\%[roup]\>\ze\s*\%([#|]\|$\)"	skipwhite nextgroup=vimCmdSep,vim9Comment contains=vimAugroupKey
-
-" Operators: {{{2
-" =========
-syn cluster	vimOperGroup	contains=@vimContinue,@vimExprList,vim9Comment,vim9LineComment,vimContinueString
-syn match	vimOper	"\a\@<!!"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimSpecFile
-syn match	vimOper	"||\|&&\|[-+*/%.]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimSpecFile
-syn match	vimOper	"?"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-" distinguish ternary : from ex-colon
-syn match	vimOper	"\s\@1<=:\ze\s\|\s\@1<=:$"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-syn match	vimOper	"??"			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString
-syn match	vimOper	"="			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn match	vimOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscript
-syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
- syn match	vimOperError	")"
-endif
-
-syn match	vimOperContinue		contained	"^\s*\\"        skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList contains=vimWhitespace
-syn match         vimOperContinueComment	contained	'^\s*["#]\\ .*' skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList contains=vimWhitespace
-syn cluster	vimOperContinue		contains=vimOperContinue,vimOperContinueComment
-
-" Lambda Expressions: {{{2
-" ==================
-syn match	vimLambdaOperator	contained	"->" skipwhite nextgroup=@vimExprList
-syn region	vimLambda	contained
-      \ matchgroup=vimLambdaBrace
-      \ start=+{\ze[[:space:][:alnum:]_.,]*\%(\n\s*\%(\\[[:space:][:alnum:]_.,]*\|"\\ .*\)\)*->+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="}" end="$"
-      \ contains=@vimContinue,@vimExprList,vimLambdaParams
-syn match	vimLambdaParams	contained	"\%({\n\=\)\@1<=\_.\{-}\%(->\)\@=" nextgroup=vimLambdaOperator contains=@vimContinue,vimFunctionParam
-
-syn match	vim9LambdaOperator   contained	"=>" skipwhite skipempty nextgroup=@vimExprList,vim9LambdaBlock,vim9LambdaOperatorComment
-syn match	vim9LambdaParen      contained	"[()]"
-syn match	vim9LambdaParams	   contained
-      \ "(\%(\<func(\|[^(]\)*\%(\n\s*\\\%(\<func(\|[^(]\)*\|\n\s*#\\ .*\)*\ze\s\+=>"
-      \ skipwhite nextgroup=vim9LambdaOperator
-      \ contains=@vim9Continue,vimDefParam,vim9LambdaParen,vim9LambdaReturnType
-syn region	vim9LambdaReturnType contained	start=")\@<=:\s" end="\ze\s*#" end="\ze\s*=>" contains=@vim9Continue,@vimType transparent
-syn region	vim9LambdaBlock	   contained	matchgroup=vimSep start="{" end="^\s*\zs}" contains=@vimDefBodyList
-
-syn match	vim9LambdaOperatorComment contained "#.*" skipwhite skipempty nextgroup=@vimExprList,vim9LambdaBlock,vim9LambdaOperatorComment
-
-" Functions: Tag is provided for those who wish to highlight tagged functions {{{2
-" =========
-syn cluster	vimFunctionBodyCommon	contains=@vimCmdList,vimCmplxRepeat,vimContinue,vimCtrlChar,vimDef,vimFBVar,vimFunction,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegister,vimSpecFile,vimString,vimSubst,vimFunctionFold,vimDefFold,vimCmdSep
-syn cluster	vimFunctionBodyList	contains=@vimFunctionBodyCommon,vimComment,vimLineComment,vimInsert,vimConst,vimLet,vimSearch
-syn cluster	vimDefBodyList		contains=@vimFunctionBodyCommon,vim9Comment,vim9LineComment,vim9Block,vim9Const,vim9Final,vim9Var,vim9Null,vim9Boolean,vim9For,vim9LhsVariable,vim9LhsVariableList,vim9LhsRegister,vim9Search,@vimSpecialVar,@vim9Func
-
-syn region	vimFunctionPattern	contained
-      \ matchgroup=vimOper
-      \ start="/"
-      \ end="$"
-      \ contains=@vimSubstList
-
-syn match	vimFunctionBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimFunctionName
-syn match	vimDefBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimDefName
-syn match	vimFunctionSID	contained	"\c<sid>"
-syn match	vimFunctionScope	contained	"\<[bwglstav]:"
-syn match	vimFunctionName	contained
-      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
-      \ skipwhite nextgroup=vimFunctionParams,vimCmdSep,vimComment,vim9Comment
-      \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag
-syn match	vimDefName	contained
-      \ "\%(<[sS][iI][dD]>\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+"
-      \ nextgroup=vimDefTypeParams,vimDefParams,vimCmdSep,vimComment,vim9Comment
-      \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag
-
-syn match	vimFunction	"\<fu\%[nction]\>"	skipwhite nextgroup=vimFunctionBang,vimFunctionName,vimFunctionPattern,vimCmdSep,vimComment
-syn match	vimDef	"\<def\>"		skipwhite nextgroup=vimDefBang,vimDefName,vimFunctionPattern,vimCmdSep,vimComment
-
-syn region	vimFunctionComment	contained
-      \ start=+".*+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="$"
-      \ skipwhite skipempty nextgroup=vimFunctionBody,vimEndfunction
-syn region	vimDefComment	contained
-      \ start="#.*"
-      \ skip=+\n\s*\%(\\\|#\\ \)+
-      \ end="$"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimEnddef
-
-syn region	vimFunctionParams	contained
-      \ matchgroup=Delimiter
-      \ start="("
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end=")"
-      \ skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError
-      \ contains=vimFunctionParam,vimOperParen,@vimContinue
-syn region	vimDefParams	contained
-      \ matchgroup=Delimiter
-      \ start="("
-      \ end=")"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimReturnType,vimCommentError
-      \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals,vimOperParen
-syn region	vimDefTypeParams	contained
-      \ matchgroup=Delimiter
-      \ start="<"
-      \ end=">"
-      \ nextgroup=vimDefParams
-      \ contains=vim9DefTypeParam
-syn match	vimFunctionParam	contained	"\<\h\w*\>\|\.\.\."	skipwhite nextgroup=vimFunctionParamEquals
-syn match	vimDefParam	contained	"\<\h\w*\>"		skipwhite nextgroup=vimParamType,vimFunctionParamEquals
-syn match	vim9DefTypeParam	contained	"\<\u\w*\>"
-
-syn match	vimFunctionParamEquals contained	"="			skipwhite	  nextgroup=@vimExprList
-syn match	vimFunctionMod	     contained	"\<\%(abort\|closure\|dict\|range\)\>"	skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError
-
-syn region	vimFunctionBody	contained
-      \ start="^."
-      \ matchgroup=vimCommand
-      \ end="\<endfu\%[nction]\>"
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9CommentError
-      \ contains=@vimFunctionBodyList
-syn region	vimDefBody	contained
-      \ start="^."
-      \ matchgroup=vimCommand
-      \ end="\<enddef\>"
-      \ skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-      \ contains=@vimDefBodyList
-
-syn match	vimEndfunction	"\<endf\%[unction]\>"	skipwhite nextgroup=vimCmdSep,vimComment,vim9CommentError
-syn match	vimEnddef	"\<enddef\>"		skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
-  syn region	vimFunctionFold
-        \ start="\<fu\%[nction]!"
-        "\ assume no dict literal in curly-brace name expressions
-        \ start="\<fu\%[nction]\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+\s*("
-        \ end="^\s*:\=\s*endf\%[unction]\>"
-        \ contains=vimFunction
-        \ extend fold keepend transparent
-  syn region	vimDefFold
-        \ start="\<def!"
-        "\ assume no dict literal in curly-brace name expressions
-        \ start="\<def\>\s*\%([[:alnum:]_:<>.#]\+\|{.\{-1,}}\)\+[<(]"
-        \ end="^\s*:\=\s*enddef\>"
-        \ contains=vimDef
-        \ extend fold keepend transparent
-endif
-
-syn match	vimDelfunctionBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimFunctionName
-syn match	vimDelfunction			"\<delf\%[unction]\>"	skipwhite nextgroup=vimDelfunctionBang,vimFunctionName
-
-" Types: {{{2
-" =====
-
-syn region	vimReturnType	contained
-      \ start=":\%(\s\|\n\)\@="
-      \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
-      \ end="$"
-      \ matchgroup=vim9Comment
-      "\ allow for legacy script tail comment error
-      \ end="\ze[#"]"
-      \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimCommentError
-      \ contains=@vim9Continue,@vimType
-      \ transparent
-syn match	vimParamType	contained	":\s"	skipwhite skipnl nextgroup=@vimType contains=vimTypeSep
-
-syn match	vimTypeSep	contained	":\%(\s\|\n\)\@=" skipwhite nextgroup=@vimType
-syn keyword	vimType	contained	blob bool channel float job number string void
-syn keyword	vimTypeAny	contained	any
-syn match	vimTypeObject	contained	"\<object<\@="	nextgroup=vimTypeObjectArgs
-syn region	vimTypeObjectArgs	contained
-      \ matchgroup=vimTypeObjectBracket
-      \ start="<"
-      \ end=">"
-      \ contains=vimTypeAny,vimTypeObject,vimUserType
-      \ oneline
-      \ transparent
-syn match	vimType	contained	"\<\%(func\)\>"
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<func("	          end=")" nextgroup=vimTypeSep contains=@vim9Continue,@vimType transparent
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<tuple<"           end=">"                      contains=@vim9Continue,@vimType transparent
-syn region	vimCompoundType	contained	matchgroup=vimType start="\<\%(list\|dict\)<" end=">"		   contains=@vimType oneline       transparent
-syn match	vimUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"
-
-syn cluster vimType contains=vimType,vimTypeAny,vimTypeObject,vimCompoundType,vimUserType
-
-" Classes, Enums And Interfaces: {{{2
-" =============================
-
-if s:vim9script
-
-  " Methods {{{3
-  syn match	vim9MethodDef		contained	"\<def\>"	skipwhite nextgroup=vim9MethodDefName,vim9ConstructorDefName
-  syn match	vim9MethodDefName		contained	"\<\h\w*\>"	nextgroup=vim9MethodDefParams,vim9MethodDefTypeParams contains=@vim9MethodName
-  syn region	vim9MethodDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vim9MethodDefReturnType,vimCommentError
-        \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9MethodDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9MethodDefParams
-        \ contains=vim9DefTypeParam
-
-  syn match	vim9ConstructorDefName	contained	"\<_\=new\w*\>"
-        \ nextgroup=vim9ConstructorDefParams,vim9ConstuctorDefTypeParams
-        \ contains=@vim9MethodName
-  syn match	vim9ConstructorDefParam	contained	"\<\%(this\.\)\=\h\w*\>"
-        \ skipwhite nextgroup=vimParamType,vimFunctionParamEquals
-        \ contains=vim9This,vimOper
-  syn region	vim9ConstructorDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError
-        \ contains=vim9ConstructorDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9ConstuctorDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9ConstructorDefParams
-        \ contains=vim9DefTypeParam
-
-  syn region	vim9MethodDefReturnType	contained
-        \ start=":\%(\s\|\n\)\@="
-        \ skip=+\n\s*\%(\\\|#\\ \)\|^\s*#\\ +
-        \ end="$"
-        \ matchgroup=vim9Comment
-        \ end="\ze#"
-        \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError
-        \ contains=@vim9Continue,vimType,vimTypeSep
-        \ transparent
-
-  syn region	vim9MethodDefComment	contained
-        \ start="#.*"
-        \ skip=+\n\s*\%(\\\|#\\ \)+
-        \ end="$"
-        \ skipwhite skipempty nextgroup=vim9MethodDefBody,vimEnddef
-
-  syn region	vim9MethodDefBody		contained
-        \ start="^.\=" matchgroup=vimCommand end="\<enddef\>"
-        \ skipwhite nextgroup=vimCmdSep,vim9Comment,vimCommentError
-        \ contains=@vim9MethodDefBodyList
-
-  syn cluster	vim9MethodDefBodyList contains=@vimDefBodyList,vim9This,vim9Super
-
-  if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
-    syn match	vim9MethodNameError contained	"\<[a-z0-9]\i\>"
-  endif
-  syn match	vim9MethodName	contained	"\<_\=new\w*\>"
-  syn keyword	vim9MethodName	contained	empty len string
-
-  syn cluster	vim9MethodName	contains=vim9MethodName,vim9MethodNameError
-
-  if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
-    syn region	vim9MethodDefFold	contained
-          \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]"
-          \ end="^\s*:\=enddef\>"
-          \ contains=vim9MethodDef
-          \ fold keepend extend transparent
-  endif
-
-  syn cluster vim9MethodDef contains=vim9MethodDef,vim9MethodDefFold
-
-  " Classes {{{3
-  syn cluster	vim9ClassBodyList		contains=vim9Abstract,vim9Class,vim9Comment,vim9LineComment,@vim9Continue,@vimExprList,vim9Extends,vim9Implements,@vim9MethodDef,vim9Public,vim9Static,vim9Const,vim9Final,vim9This,vim9Super,vim9Var
-
-  syn match	vim9Class		contained	"\<class\>"	skipwhite        nextgroup=vim9ClassName
-  syn match	vim9ClassName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Extends,vim9Implements
-  syn match	vim9SuperClass		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Implements
-  syn match	vim9ImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9InterfaceListComma,vim9Extends
-  syn match	vim9InterfaceListComma	contained	","	skipwhite skipnl nextgroup=vim9ImplementedInterface
-  syn keyword	vim9Abstract			abstract	skipwhite skipnl nextgroup=vim9ClassBody,vim9AbstractDef
-  syn keyword	vim9Extends		contained	extends	skipwhite skipnl nextgroup=vim9SuperClass
-  syn keyword	vim9Implements		contained	implements	skipwhite skipnl nextgroup=vim9ImplementedInterface
-  syn keyword	vim9Public		contained	public
-  syn keyword	vim9Static		contained	static
-  " FIXME: don't match as dictionary keys, remove when operators are not
-  "        shared between Vim9 and legacy script
-  syn match	vim9This		contained	"\.\@1<!\<this\>:\@!"
-  " super must be followed by '.'
-  syn match	vim9Super		contained	"\.\@1<!\<super\.\@="
-
-  VimFoldc syn region	vim9ClassBody	start="\<class\>" matchgroup=vimCommand end="\<endclass\>" contains=@vim9ClassBodyList transparent
-
-  " Enums {{{3
-  syn cluster	vim9EnumBodyList		contains=vim9Comment,vim9LineComment,@vim9Continue,vim9Enum,@vimExprList,@vim9MethodDef,vim9Public,vim9Static,vim9Const,vim9Final,vim9This,vim9Var
-
-  syn match	vim9Enum		contained	"\<enum\>"	skipwhite           nextgroup=vim9EnumName
-
-  syn match	vim9EnumName		contained	"\<\u\w*\>"	skipwhite skipempty nextgroup=vim9EnumNameTrailing,vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue,vim9EnumImplements
-  syn match	vim9EnumNameTrailing	contained	"\S.*"
-  syn region	vim9EnumNameComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumNameComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-  " vim9EnumName's "skipempty" should only apply to comments and enum values and not implements clauses
-  syn match	vim9EnumNameEmpty		contained	"^"	skipwhite skipempty nextgroup=vim9EnumNameComment,vim9EnumValue
-  " allow line continuation between enum name and "implements"
-  syn match	vim9EnumNameContinue	contained
-        \ "^\s*\\"
-        \ skipwhite skipnl nextgroup=vim9EnumNameTrailing,vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue,vim9EnumImplements
-        \ contains=vimWhitespace
-  syn match	vim9EnumNameContinueComment	contained
-        \ "^\s*#\\ .*"
-        \ skipwhite skipnl nextgroup=vim9EnumNameEmpty,vim9EnumNameComment,@vim9EnumNameContinue
-        \ contains=vimWhitespace
-  syn cluster	vim9EnumNameContinue	contains=vim9EnumNameContinue,vim9EnumNameContinueComment
-
-  " enforce enum value list location
-  syn match	vim9EnumValue		contained	"\<\a\w*\>"		  nextgroup=vim9EnumValueTypeArgs,vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment
-  syn match	vim9EnumValueListComma	contained	","	skipwhite skipempty nextgroup=vim9EnumValue,vim9EnumValueListCommaComment
-  syn region	vim9EnumValueListCommaComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumValueListCommaComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-  syn region	vim9EnumValueTypeArgs	contained
-        \ matchgroup=Delimiter
-        \ start="<\ze\a"
-        \ end=">"
-        \ nextgroup=vim9EnumValueArgList
-        \ contains=@vimType
-        \ oneline
-  syn region	vim9EnumValueArgList	contained
-        \ matchgroup=vimParenSep start="(" end=")"
-        \ nextgroup=vim9EnumValueListComma
-        \ contains=@vimExprList,vimContinueString,vim9Comment
-
-  syn keyword	vim9EnumImplements	contained	implements	skipwhite        nextgroup=vim9EnumImplementedInterface
-  syn match	vim9EnumImplementedInterface	contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9EnumInterfaceListComma,vim9EnumImplementedInterfaceComment,vim9EnumValue
-  syn match	vim9EnumInterfaceListComma	contained	","	skipwhite        nextgroup=vim9EnumImplementedInterface
-  syn region	vim9EnumImplementedInterfaceComment	contained
-        \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$"
-        \ skipwhite skipempty nextgroup=vim9EnumImplementedInterfaceComment,vim9EnumValue
-        \ contains=@vimCommentGroup,vimCommentString
-
-  VimFolde syn region	vim9EnumBody	start="\<enum\>" matchgroup=vimCommand end="\<endenum\>" contains=@vim9EnumBodyList transparent
-
-  " Interfaces {{{3
-  " TODO: limit to decl only - no init values
-  syn cluster	vim9InterfaceBodyList	contains=vim9Comment,vim9LineComment,@vim9Continue,vim9Extends,vim9Interface,vim9AbstractDef,vim9Var
-
-  syn match	vim9Interface		contained	"\<interface\>"	skipwhite nextgroup=vim9InterfaceName
-  syn match	vim9InterfaceName		contained	"\<\u\w*\>"	skipwhite skipnl nextgroup=vim9Extends
-
-  syn keyword	vim9AbstractDef		contained	def	skipwhite nextgroup=vim9AbstractDefName
-  syn match	vim9AbstractDefName	contained	"\<\h\w*\>"	skipwhite nextgroup=vim9AbstractDefParams,vim9AbstractDefTypeParams contains=@vim9MethodName
-  syn region	vim9AbstractDefParams	contained
-        \ matchgroup=Delimiter start="(" end=")"
-        \ skipwhite skipnl nextgroup=vimDefComment,vim9AbstractDefReturnType,vimCommentError
-        \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals
-  syn region	vim9AbstractDefReturnType	contained
-        \ start=":\s" end="$" matchgroup=vim9Comment end="\ze[#"]"
-        \ skipwhite skipnl nextgroup=vimDefComment,vimCommentError
-        \ contains=vimTypeSep
-        \ transparent
-  syn region	vim9AbstractDefTypeParams	contained
-        \ matchgroup=Delimiter
-        \ start="<"
-        \ end=">"
-        \ nextgroup=vim9AbstractDefParams
-        \ contains=vim9DefTypeParam
-
-  VimFoldi syn region	vim9InterfaceBody	start="\<interface\>" matchgroup=vimCommand end="\<endinterface\>" contains=@vim9InterfaceBodyList transparent
-
-  " Type Aliases {{{3
-  syn match	vim9Type		"\<ty\%[pe]\>"	skipwhite nextgroup=vim9TypeAlias,vim9TypeAliasError
-  syn match	vim9TypeAlias	 contained	"\<\u\w*\>"	skipwhite nextgroup=vim9TypeEquals
-  syn match	vim9TypeEquals	 contained	"="	skipwhite nextgroup=@vimType
-  if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_notypealiaserror")
-    syn match	vim9TypeAliasError contained	"\<\l\w*\>"	skipwhite nextgroup=vim9TypeEquals
-  endif
-endif
-
-" Blocks: {{{2
-" ======
-Vim9 syn region	vim9Block
-      \ matchgroup=vimSep
-      \ start="{\ze\s*\%($\|[#|]\)"
-      \ end="^\s*\zs}"
-      \ skipwhite nextgroup=vim9Comment,vimCmdSep
-      \ contains=@vimDefBodyList
-
-" Keymaps: {{{2
-" =======
-
-syn match  vimKeymapStart	"^"	contained skipwhite nextgroup=vimKeymapLhs,@vimKeymapLineComment
-syn match  vimKeymapLhs	"\S\+"	contained skipwhite nextgroup=vimKeymapRhs contains=vimNotation
-syn match  vimKeymapRhs	"\S\+"	contained skipwhite nextgroup=vimKeymapTailComment contains=vimNotation
-syn match  vimKeymapTailComment	"\S.*"	contained
-
-" TODO: remove when :" comment is matched in parts as "ex-colon comment" --djk
-if s:vim9script
-  syn match  vim9KeymapLineComment	"#.*"	contained contains=@vimCommentGroup,vimCommentString,vim9CommentTitle
-else
-  syn match  vimKeymapLineComment	+".*+	contained contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-endif
-syn cluster vimKeymapLineComment contains=vim9\=KeymapLineComment
-
-syn region vimLoadkeymap matchgroup=vimCommand start="\<loadk\%[eymap]\>" end="\%$" contains=vimKeymapStart
-
-" Special Filenames, Modifiers, Extension Removal: {{{2
-" ===============================================
-syn match	vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%$"ms=s+1		nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFile	"#\d\+\|[#%]<\>"		nextgroup=vimSpecFileMod,vimSubst1
-syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
-
-syn match	vimSpecFile	contained		"%[ \t:]"me=e-1	nextgroup=vimSpecFileMod
-syn match	vimSpecFile	contained	excludenl	"%$"	nextgroup=vimSpecFileMod
-syn match	vimSpecFile	contained		"%<"me=e-1	nextgroup=vimSpecFileMod
-
-" User-Specified Commands: {{{2
-" =======================
-syn cluster	vimUserCmdList	contains=@vimCmdList,vimCmplxRepeat,@vimComment,vimCtrlChar,vimEscapeBrace,@vimFunc,vimNotation,vimNumber,vimOper,vimRegister,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange
-
-syn match	vimUserCmd	"\<com\%[mand]\>!\="		skipwhite        nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
-syn match	vimUserCmd	+\<com\%[mand]\>!\=\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimUserCmdAttrs,vimUserCmdName contains=vimBang
-
-syn region	vimUserCmdAttrs	    contained
-      \ start="-\l"
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ end="\ze\s\u"
-      \ skipwhite nextgroup=vimUserCmdName
-      \ contains=@vimContinue,vimUserCmdAttr,vimUserCmdAttrError
-      \ transparent
-syn match	vimUserCmdAttrError contained	"-\a\+\ze\%(\s\|=\)"
-syn match	vimUserCmdAttr	  contained	"-addr="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrAddr
-syn match	vimUserCmdAttr	  contained	"-bang\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-bar\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-buffer\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-complete="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrComplete,vimUserCmdError
-syn match	vimUserCmdAttr	  contained	"-count\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-count="		contains=vimUserCmdAttrKey nextgroup=vimNumber
-syn match	vimUserCmdAttr	  contained	"-keepscript\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-nargs="		contains=vimUserCmdAttrKey nextgroup=vimUserCmdAttrNargs
-syn match	vimUserCmdAttr	  contained	"-range\>"		contains=vimUserCmdAttrKey
-syn match	vimUserCmdAttr	  contained	"-range="		contains=vimUserCmdAttrKey nextgroup=vimNumber,vimUserCmdAttrRange
-syn match	vimUserCmdAttr	  contained	"-register\>"		contains=vimUserCmdAttrKey
-
-syn match	vimUserCmdAttrNargs	contained	"[01*?+]"
-syn match	vimUserCmdAttrRange	contained	"%"
-
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nousercmderror")
- syn match	vimUserCmdError	contained	"\S\+\>"
-endif
-
-syn case ignore
-syn keyword	vimUserCmdAttrKey   contained	a[ddr] ban[g] bar bu[ffer] com[plete] cou[nt] k[eepscript] n[args] ra[nge] re[gister]
-
-" GEN_SYN_VIM: vimUserCmdAttrComplete, START_STR='syn keyword vimUserCmdAttrComplete contained', END_STR=''
-syn keyword vimUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype filetypecmd function help highlight history keymap locale mapclear mapping menu messages option packadd retab runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
-syn keyword vimUserCmdAttrComplete contained arglist augroup behave breakpoint buffer color command compiler cscope diff_buffer dir dir_in_path environment event expression file file_in_path filetype function help highlight history keymap locale mapclear mapping menu messages option packadd runtime scriptnames shellcmd shellcmdline sign syntax syntime tag tag_listfiles user var
-syn keyword	vimUserCmdAttrComplete	contained	custom customlist nextgroup=vimUserCmdAttrCompleteFunc,vimUserCmdError
-syn match	vimUserCmdAttrCompleteFunc	contained	",\%([bwglstav]:\|<[sS][iI][dD]>\)\=\h\w*\%([.#]\h\w*\)*"hs=s+1 nextgroup=vimUserCmdError contains=vimVarScope,vimFunctionSID
-
-" GEN_SYN_VIM: vimUserCmdAttrAddr, START_STR='syn keyword vimUserCmdAttrAddr contained', END_STR=''
-syn keyword vimUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
-syn keyword vimUserCmdAttrAddr contained arguments arg buffers buf lines line loaded_buffers load other quickfix qf tabs tab windows win
-syn match	vimUserCmdAttrAddr     contained	"?"
-syn case match
-
-syn match	vimUserCmdName	    contained	"\<\u[[:alnum:]]*\>"		skipwhite        nextgroup=vimUserCmdBlock,vimUserCmdReplacement
-syn match	vimUserCmdName	    contained	+\<\u[[:alnum:]]*\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimUserCmdBlock,vimUserCmdReplacement
-syn region	vimUserCmdReplacement contained
-      \ start="\S"
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue,@vimUserCmdList,vimComFilter
-      \ keepend
-syn region	vimUserCmdBlock	    contained
-      \ matchgroup=vimSep
-      \ start="{"
-      \ end="^\s*\zs}"
-      \ contains=@vimDefBodyList,@vimUserCmdList
-
-syn match	vimDelcommand		"\<delc\%[ommand]\>"	skipwhite nextgroup=vimDelcommandAttr,vimDelcommandName
-syn match	vimDelcommandAttr	contained	"-buffer\>"		skipwhite nextgroup=vimDelcommandName
-syn match	vimDelcommandName	contained	"\<\u[[:alnum:]]*\>"
-
-" Lower Priority Comments: after some vim commands... {{{2
-" =======================
-if get(g:, "vimsyn_comment_strings", 1)
-  syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e end='"' extend
-endif
-
-if s:vim9script
-  syn cluster vimComment contains=vim9Comment
-else
-  syn cluster vimComment contains=vimComment
-endif
-
-VimL syn region	vimComment
-      \ excludenl
-      \ start=+"+
-      \ skip=+\n\s*\%(\\\|"\\ \)+
-      \ end="$"
-      \ contains=@vimCommentGroup,vimCommentString
-      \ extend
-Vim9 syn region	vim9Comment
-      \ excludenl
-      \ start="\%#=1\s\@1<=#\%({\@!\|{{\)"
-      \ skip="\n\s*\%(\\\|#\\ \)"
-      \ end="$"
-      \ contains=@vimCommentGroup,vimCommentString
-      \ extend
-
-syn match	vim9CommentError	contained	"#.*"
-syn match	vimCommentError	contained	+".*+
-
-" Environment Variables: {{{2
-" =====================
-syn match	vimEnvvar	"\$\I\i*"
-syn match	vimEnvvar	"\${\I\i*}"
-
-" Strings {{{2
-" =======
-
-" In-String Specials:
-" Try to catch strings, if nothing else matches (therefore it must precede the others!)
-"  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
-" syn region	vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
-syn match	vimPatSepErr	contained	"\\)"
-syn match	vimPatSep	contained	"\\|"
-syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@vimStringGroup
-syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
-syn match	vimNotPatSep	contained	"\\\\"
-syn cluster	vimStringGroup	contains=vimEscape,vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscript contains=@vimStringGroup extend
-syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscript contains=vimQuoteEscape  extend
-"syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
-
-syn match	vimEscape	contained	"\\."
-" syn match	vimEscape	contained	+\\[befnrt\"]+
-syn match	vimEscape	contained	"\\\o\{1,3}\|\\[xX]\x\{1,2}\|\\u\x\{1,4}\|\\U\x\{1,8}"
-syn match	vimEscape	contained	"\\<" contains=vimNotation
-syn match	vimEscape	contained	"\\<\*[^>]*>\=>"
-syn match	vimQuoteEscape	contained	"''"
-
-syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscript contains=@vimStringInterpolation,vimQuoteEscape  extend
-syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscript contains=@vimStringInterpolation,@vimStringGroup extend
-syn region	vimStringInterpolationExpr  oneline contained matchgroup=vimSep start=+{+ end=+}+ contains=@vimExprList
-syn match	vimStringInterpolationBrace contained "{{"
-syn match	vimStringInterpolationBrace contained "}}"
-syn cluster	vimStringInterpolation contains=vimStringInterpolationExpr,vimStringInterpolationBrace
-
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,vimQuoteEscape
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
-
-" Substitutions: {{{2
-" =============
-syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
-syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
-syn cluster	vimSubstList	add=vimCollection
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\>"		skipwhite nextgroup=vimSubstPat,vimSubstFlags,vimSubstCount
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=vimSubstPat
-syn match	vimSubst		"^\s*\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=vimSubstCount
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\>"		skipwhite nextgroup=vimSubstPat,vimSubstFlags,vimSubstCount
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)[_#]\@="	skipwhite nextgroup=vimSubstPat
-syn match	vimSubst1	contained	"\%(s\%[ubstitute]\|sm\%[agic]\>\|sno\%[magic]\)\%(\d\+\)\@="	skipwhite nextgroup=vimSubstCount
-syn match	vimSubstFlagErr	contained	"[^< \t\r|]\+" contains=vimSubstFlags
-" & and # after :s are always pattern delimiters not flags
-syn match	vimSubstFlags	contained	"[&cegiIlnpr#]\+"	skipwhite nextgroup=vimSubstCount
-syn match	vimSubstCount	contained	"\d\+\>"
-" TODO: Vim9 illegal separators for abbreviated :s form are [-.:], :su\%[...] required
-"     : # is allowed but "not recommended" (see :h pattern-delimiter)
-syn region	vimSubstPat	contained	matchgroup=vimSubstDelim start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
-syn region	vimSubstRep4	contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>"	contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
-syn region	vimCollection	contained 	transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
-syn match	vimCollClassErr	contained	"\[:.\{-\}:\]"
-syn match	vimCollClass	contained 	transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|retu\%[rn]\|tab\|escape\|backspace\):\]"
-syn match	vimSubstSubstr	contained	"\\z\=\d"
-syn match	vimSubstTwoBS	contained	"\\\\"
-
-" TODO: flags, unlike count, must follow immediately
-"     : distinguish from with Vim9 &var
-" syn match	vimSubst		"^\s*\zs&&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst		"^\s*\zs\~&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst1	contained	"&&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-" syn match	vimSubst1	contained	"\~&\="	skipwhite nextgroup=vimSubstFlags,vimSubstCount
-
-" two and three letter variants (matched as :s + flags, count may follow immediately)
-syn match	vimSubst		"^\s*\zssc[egiIlnp]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssi[ceInpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssI[ceginplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst		"^\s*\zssr[cgiInplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-
-syn match	vimSubst1	contained	"\<sc[egiIlnp]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sg[ceiIlnpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<si[ceInpr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sI[ceginplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-syn match	vimSubst1	contained	"\<sr[cgiInplr]\=\a\@!"	skipwhite nextgroup=vimSubstCount	contains=vimSubstFlags
-
-" Vi compatibility
-syn match	vimSubstDelim	contained	"\\"
-syn match	vimSubstPat	contained	"\\\ze[/?&]" contains=vimSubstDelim nextgroup=vimSubstRep4
-
-" Mark: {{{2
-" ====
-VimL syn match	vimExMark	"\<k\%([a-zA-Z0-9]\>\|[[\]<>'`]\)\@="         nextgroup=@vimMarkArg
-VimL syn match	vimExMark	"\<k\>"	      	skipwhite nextgroup=@vimMarkArg
-syn match	vimExMark	"\<mark\>"	      	skipwhite nextgroup=@vimMarkArg
-
-syn match	vimMarkArg	contained	"[a-zA-Z]\>\|[[\]<>'`]"	skipwhite nextgroup=vimCmdSep,vimComment
-syn match	vimMarkArgError	contained	"["^.(){}0-9]"
-syn cluster	vimMarkArg	contains=vimMarkArg,vimMarkArgError
-
-" Marks, Registers, Addresses, Filters: {{{2
-syn match	vimMark	"'[a-zA-Z0-9]\ze\s*$"
-syn match	vimMark	"'[[\]{}()<>'`"^.]\ze\s*$"
-syn match	vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	"'[[\]{}()<>'`"^.]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	",\zs'[[\]{}()<>'`"^.]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst1
-syn match	vimMarkNumber	"[-+]\d\+"		contained contains=vimOper nextgroup=vimSubst1
-syn match	vimPlainMark contained	"'[a-zA-Z0-9]"
-syn match	vimRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=vimMark	skipwhite nextgroup=vimFilter
-
-syn match	vimRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
-syn match	vimRegister	'@"'
-syn match	vimLetRegister	contained	'@["@0-9\-a-zA-Z:.%#=*+~_/]'
-
-syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
-syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
-
-syn match	vimFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=vimOper,vimSpecFile
-
-" Complex Repeats: (:h complex-repeat) {{{2
-" ===============
-syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
-
-" NOTE: :* as an alias for :@ is not supported, this is considered a :range,
-" see :help cpo-star
-syn match	vimAtArg	contained	+@\@1<=[0-9a-z".=*+:@]+
-syn match	vimAt	+@[0-9a-z".=*+:@]\ze\s*\%($\|[|"#]\)+	skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment contains=vimAtArg
-" Vim9: avoid LHS assignment mismatching of :@["#]
-syn match	vimAt	+@\ze\s*\%($\||\|\s["#]\)+		skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" Set command and associated set-options (vimOptions) with comment {{{2
-syn match	vimSet		"\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skipwhite nextgroup=vimSetBang,vimCmdSep,vimComment,vimSetArgs
-syn region	vimSetComment	contained	start=+"+ skip=+\n\s*\%(\\\||"\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString extend
-syn match	vimSetCmdSep	contained	"|" skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
-syn match	vimSetEscape	contained	"\\\%(\\[|"]\|.\)"
-syn match	vimSetBarEscape	contained	"\\|"
-syn match	vimSetQuoteEscape	contained	+\\"+
-syn region	vimSetArgs	contained
-      \ start="\l\|<"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*"\\ +
-      \ end=+\ze\\\@1<![|"]+
-      "\ assume this isn't an escaped char with backslash on the previous line
-      \ end=+^\s*\\\ze[|"]+
-      \ end="\ze\s#"
-      \ end="$"
-      \ nextgroup=vimSetCmdSep,vimSetComment,vim9Comment
-      \ contains=@vimContinue,vimErrSetting,vimOption,vimSetAll,vimSetTermcap
-      \ keepend
-" TODO: restrict this to valid values?
-syn match	vimOption	contained	"<[^>]\+>"	contains=vimOption
-syn region	vimSetEqual	contained
-      \ matchgroup=vimOper
-      \ start="[=:]\|[-+^]="
-      \ skip=+\\\s\|^\s*\%(\\\|["#]\\ \)+
-      \ end="\ze\s"
-      \ contains=@vimContinue,vimCtrlChar,vimEnvvar,vimNotation,vimSetSep,vimSetEscape,vimSetBarEscape,vimSetQuoteEscape
-syn match	vimSetBang	contained	"\a\@1<=!" skipwhite nextgroup=vimSetAll,vimSetTermcap
-syn keyword	vimSetAll	contained	all nextgroup=vimSetMod
-syn keyword	vimSetTermcap	contained	termcap
-syn match	vimSetSep	contained	"[,:]"
-syn match	vimSetMod	contained	"\a\@1<=\%(&vim\=\|[!&?<]\)"
-
-" Variable Declarations: {{{2
-" =====================
-VimL syn keyword	vimLet	let		skipwhite nextgroup=@vimSpecialVar,vimVar,vimVarList,vimLetVar
-VimL syn keyword	vimConst	cons[t]		skipwhite nextgroup=@vimSpecialVar,vimVar,vimVarList,vimLetVar
-syn region	vimVarList	contained
-      \ start="\[" end="]"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vimContinue,@vimSpecialVar,vimVar
-syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscript
-hi link vimLetVar vimVar
-syn region	vimLetVarSubscript contained
-      \ matchgroup=vimSubscriptBracket
-      \ start="\S\@1<=\["
-      \ end="]"
-      \ skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc
-      \ contains=@vimExprList
-
-syn keyword	vimUnlet		unl[et]	skipwhite nextgroup=vimUnletBang,vimUnletVars
-syn match	vimUnletBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimUnletVars
-syn region	vimUnletVars	contained
-      \ start="$\I\|\h" skip=+\n\s*\%(\\\|["#]\\ \)\|^\s*["#]\\ + end="$" end=+\ze\s*[|"#]+
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-      \ contains=@vimContinue,vimEnvvar,vimVar,vimVimVar
-
-" TODO: type error after register or environment variables (strings)
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*trim\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1\=\z2$"
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="=<<\%(\s*\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop end="^\z1$"
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="\%(^\z(\s*\)\S.*\)\@<==<<\s*\%(trim\s\+eval\|eval\s\+trim\)\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1\=\z2$"
-      \ contains=@vimStringInterpolation
-      \ extend
-VimFoldh syn region vimLetHeredoc	contained
-      \ matchgroup=vimLetHeredocStart
-      \ start="=<<\s*eval\%(\s\+\)\@>\z(\L\S*\)"
-      \ matchgroup=vimLetHeredocStop
-      \ end="^\z1$"
-      \ contains=@vimStringInterpolation
-      \ extend
-
-Vim9 syn keyword	vim9Const	const	skipwhite nextgroup=vim9Variable,vim9VariableList
-Vim9 syn keyword	vim9Final	final	skipwhite nextgroup=vim9Variable,vim9VariableList
-Vim9 syn keyword	vim9Var	var	skipwhite nextgroup=vim9Variable,vim9VariableList
-
-syn match	vim9Variable	contained	"\<\h\w*\>"	skipwhite nextgroup=vim9VariableTypeSep,vimLetHeredoc,vimOper
-syn region	vim9VariableList	contained	start="\[" end="]" contains=@vimContinue,@vimSpecialVar,vim9Variable skipwhite nextgroup=vimLetHeredoc
-
-syn match	vim9VariableTypeSep	contained	"\S\@1<=:\%(\s\|\n\)\@="		skipwhite nextgroup=@vim9VariableType
-syn keyword	vim9VariableType		contained	blob bool channel float job number string void	skipwhite nextgroup=vimLetHeredoc
-syn keyword	vim9VariableTypeAny	contained	any			skipwhite nextgroup=vimLetHeredoc
-syn match	vim9VariableTypeObject	contained	"\<object<\@="			          nextgroup=vim9VariableTypeObjectArgs
-syn region	vim9VariableTypeObjectArgs
-      \ matchgroup=vim9VariableTypeObjectBracket
-      \ start="<"
-      \ end=">"
-      \ contains=vimTypeAny,vimTypeObject,vimUserType
-      \ oneline
-      \ transparent
-syn match	vim9VariableType		contained	"\<\%(func\)\>"			skipwhite nextgroup=vimLetHeredoc
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<func("
-      \ end=")"
-      \ skipwhite nextgroup=vim9VariableTypeSep,vimLetHeredoc
-      \ contains=@vim9Continue,@vim9VariableType
-      \ transparent
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<tuple<"
-      \ end=">"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vim9Continue,@vim9VariableType
-      \ transparent
-syn region	vim9VariableCompoundType	contained
-      \ matchgroup=vim9VariableType
-      \ start="\<\%(list\|dict\)<"
-      \ end=">"
-      \ skipwhite nextgroup=vimLetHeredoc
-      \ contains=@vim9VariableType
-      \ oneline
-      \ transparent
-syn match	vim9VariableUserType	contained	"\<\%(\h\w*\.\)*\u\w*\>"	skipwhite nextgroup=vimLetHeredoc
-
-syn cluster vim9VariableType contains=vim9VariableType,vim9VariableTypeAny,vim9VariableTypeObject,vim9VariableCompoundType,vim9VariableUserType
-
-" Lockvar and Unlockvar: {{{2
-" =====================
-syn keyword	vimLockvar	lockv[ar]	skipwhite nextgroup=vimLockvarBang,vimLockvarDepth,vimLockvarVars
-syn keyword	vimUnlockvar	unlo[ckvar]	skipwhite nextgroup=vimLockvarBang,vimLockvarDepth,vimLockvarVars
-syn match	vimLockvarBang	contained	"\a\@1<=!"	skipwhite nextgroup=vimLockvarVars
-syn match	vimLockvarDepth	contained	"\<[0-3]\>"	skipwhite nextgroup=vimLockvarVars
-syn region	vimLockvarVars	contained
-      \ start="\h" skip=+\n\s*\%(\\\|"\\ \)\|^\s*"\\ + end="$" end="\ze[|"]"
-      \ nextgroup=vimCmdSep,vimComment
-      \ contains=@vimContinue,vimVar
-
-hi def link vimLockvar vimCommand
-hi def link vimUnlockvar vimCommand
-hi def link vimLockvarBang vimBang
-hi def link vimLockvarDepth vimNumber
-
-" For: {{{2
-" ===
-" handles Vim9 and legacy for now
-syn region	vimFor
-      \ matchgroup=vimCommand
-      \ start="\<for\>" end="\<in\>"
-      \ skipwhite skipnl nextgroup=@vimForInContinue,vim9ForInComment,@vimExprList
-      \ contains=@vimContinue,vimVar,vimVarList,vim9Variable,vim9VariableList
-      \ transparent
-
-syn match	vim9ForInComment		contained	"#.*"	skipwhite skipempty nextgroup=vimForInComment,@vimExprList
-
-syn match	vimForInContinue		contained	"^\s*\zs\\"	 skipwhite skipnl nextgroup=@vimForInContinue,@vimExprList
-syn match         vimForInContinueComment	contained	'^\s*\zs["#]\\ .*' skipwhite skipnl nextgroup=@vimForInContinue,@vimExprList
-syn cluster	vimForInContinue		contains=vimForInContinue,vimForInContinueComment
-
-" Abbreviations: {{{2
-" =============
-" GEN_SYN_VIM: vimCommand abbrev, START_STR='syn keyword vimAbb', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-syn keyword vimAbb ab[breviate] ca[bbrev] cnorea[bbrev] cuna[bbrev] ia[bbrev] inorea[bbrev] iuna[bbrev] norea[bbrev] una[bbreviate] skipwhite nextgroup=vimMapMod,vimMapLhs
-" GEN_SYN_VIM: vimCommand abclear, START_STR='syn keyword vimAbb', END_STR='skipwhite nextgroup=vimMapMod'
-syn keyword vimAbb abc[lear] cabc[lear] iabc[lear] skipwhite nextgroup=vimMapMod
-
-" Filename Patterns: {{{2
-" =================
-
-syn match	vimWildcardQuestion	contained	"?"
-syn match	vimWildcardStar		contained	"*"
-
-syn match	vimWildcardBraceComma	contained	","
-syn region	vimWildcardBrace		contained
-      \ matchgroup=vimWildcard
-      \ start="{"
-      \ end="}"
-      \ contains=vimWildcardEscape,vimWildcardBrace,vimWildcardBraceComma,vimWildcardQuestion,vimWildcardStar,vimWildcardBracket
-      \ oneline
-
-syn match	vimWildcardIntervalNumber	contained	"\d\+"
-syn match	vimWildcardInterval	contained	"\\\\\\{\d\+\%(,\d\+\)\=\\}" contains=vimWildcardIntervalNumber
-
-
-syn match	vimWildcardBracket	contained	"\[\%(\^\=]\=\%(\\.\|\[\([:.=]\)[^:.=]\+\1]\|[^][:space:]]\)*\)\@>]"
-      \ contains=vimWildcardBracketStart,vimWildcardEscape
-
-syn match	vimWildcardBracketCharacter	contained	"."	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketHyphen,vimWildcardBracketEnd
-syn match	vimWildcardBracketRightBracket	contained	"]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketHyphen	contained	"-]\@!"	nextgroup=@vimWildcardBracketCharacter
-syn match	vimWildcardBracketEscape	contained	"\\."	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketHyphen,vimWildcardBracketEnd
-syn match	vimWildcardBracketCharacterClass	contained	"\[:[^:]\+:]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketEquivalenceClass	contained	"\[=[^=]\+=]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-syn match	vimWildcardBracketCollatingSymbol	contained	"\[\.[^.]\+\.]"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketEnd
-
-syn match	vimWildcardBracketStart	contained	"\["	nextgroup=vimWildcardBracketCaret,vimWildcardBracketRightBracket,@vimWildcardBracketCharacter
-syn match	vimWildcardBracketCaret	contained	"\^"	nextgroup=@vimWildcardBracketCharacter,vimWildcardBracketRightBracket
-syn match	vimWildcardBracketEnd	contained	"]"
-
-syn cluster	vimWildcardBracketCharacter	contains=vimWildcardBracketCharacter,vimWildcardBracketEscape,vimWildcardBracketCharacterClass,vimWildcardBracketEquivalenceClass,vimWildcardBracketCollatingSymbol
-
-syn match	vimWildcardEscape	contained	"\\."
-
-syn cluster	vimWildcard		contains=vimWildcardQuestion,vimWildcardStar,vimWildcardBrace,vimWildcardBracket,vimWildcardInterval
-
-" Autocmd and Doauto{cmd,all}: {{{2
-" ===========================
-
-" TODO: explicitly match the {cmd} arg rather than bailing out to TOP
-syn region	vimAutocmdBlock	contained	matchgroup=vimSep start="{" end="^\s*\zs}" contains=@vimDefBodyList
-
-syn match	vimAutocmdGroup	contained	"\%(\\["|[:space:]]\|[^"|[:space:]]\)\+" skipwhite nextgroup=vimAutoEvent,vimAutoEventGlob
-syn match	vimAutocmdBang	contained	"\a\@1<=!"		     skipwhite nextgroup=vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
-
-" TODO: cleaner handling of | in pattern position
-"     : match pattern items in addition to wildcards
-syn region	vimAutocmdPattern	contained
-      \ start="|\@!\S"
-      \ skip="\\\\\|\\[,[:space:]]"
-      \ end="\ze[,[:space:]]"
-      \ end="$"
-      \ skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
-      \ contains=vimEnvvar,@vimWildcard,vimAutocmdPatternEscape
-syn match	vimAutocmdBufferPattern	contained	"<buffer\%(=\%(\d\+\|abuf\)\)\=>" skipwhite nextgroup=vimAutocmdPatternSep,vimAutocmdMod,vimAutocmdBlock,@vimFunc
-" trailing pattern separator comma allowed
-syn match	vimAutocmdPatternSep	contained	","	                skipwhite nextgroup=@vimAutocmdPattern,vimAutocmdMod,vimAutocmdBlock
-syn match	vimAutocmdPatternEscape	contained	"\\."
-syn cluster	vimAutocmdPattern		contains=vimAutocmdPattern,vimAutocmdBufferPattern
-
-" TODO: Vim9 requires '++' prefix
-syn match	vimAutocmdMod	contained	"\%(++\)\=\<nested\>" skipwhite nextgroup=vimAutocmdMod,vimAutocmdBlock
-syn match	vimAutocmdMod	contained	"++once\>"	skipwhite nextgroup=vimAutocmdMod,vimAutocmdBlock
-
-" higher priority than vimAutocmdGroup, assume no group is so named
-syn match	vimAutoEventGlob	contained	"*"	skipwhite nextgroup=@vimAutocmdPattern
-syn match	vimAutoEventSep	contained	"\a\@1<=,"	nextgroup=vimAutoEvent
-syn match	vimUserAutoEventSep contained	"\a\@1<=,"	nextgroup=vimUserAutoEvent
-
-syn match	vimAutocmd		"\<au\%[tocmd]\>"	skipwhite nextgroup=vimAutocmdBang,vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
-
-
-syn match	vimDoautocmdMod	contained	"<nomodeline>"		skipwhite nextgroup=vimAutocmdGroup,vimAutoEvent
-syn match	vimDoautocmd		"\<do\%[autocmd]\>"	skipwhite nextgroup=vimDoautocmdMod,vimAutocmdGroup,vimAutoEvent
-syn match	vimDoautocmd		"\<doautoa\%[ll]\>"	skipwhite nextgroup=vimDoautocmdMod,vimAutocmdGroup,vimAutoEvent
-
-" Echo And Execute: -- prefer strings! {{{2
-" ================
-" NOTE: No trailing comments
-
-syn region	vimEcho
-      \ matchgroup=vimCommand
-      \ start="\<ec\%[ho]\>"
-      \ start="\<echoe\%[rr]\>"
-      \ start="\<echom\%[sg]\>"
-      \ start="\<echoc\%[onsole]\>"
-      \ start="\<echon\>"
-      \ start="\<echow\%[indow]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment
-      \ transparent
-
-syn match	vimEchohl	"\<echohl\=\>"	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchohlNone
-syn case ignore
-syn keyword	vimEchohlNone	contained none
-syn case match
-
-syn cluster	vimEcho	contains=vimEcho,vimEchohl
-
-syn region	vimExecute
-      \ matchgroup=vimCommand
-      \ start="\<exe\%[cute]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment
-      \ transparent
-
-syn region	vimEval
-      \ matchgroup=vimCommand
-      \ start="\<ev\%[al]\>"
-      \ skip=+\\|\|||\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ excludenl end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,@vimExprList,vim9Comment,vimComment
-      \ transparent
-
-" Filter: {{{2
-" ======
-syn match	vimExFilter		"\<filt\%[er]\>"	skipwhite nextgroup=vimExFilterBang,vimExFilterPattern
-syn region	vimExFilterPattern contained
-      \ start="[[:ident:]]"
-      \ end="\ze[[:space:]\n]"
-      \ skipwhite nextgroup=@vimCmdList
-      \ contains=@vimSubstList
-      \ oneline
-syn region	vimExFilterPattern contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:ident:]|"]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimCmdList
-      \ contains=@vimSubstList
-      \ oneline
-syn match	vimExFilterBang	 contained	"\a\@1<=!"	skipwhite nextgroup=vimExFilterPattern
-
-" Grep and Make: {{{2
-" =============
-" | is the command separator, escaped with \| all other backslashes are passed through literally, no tail comments
-syn match	vimGrep		"\<l\=gr\%[ep]\>"		skipwhite nextgroup=vimGrepBang,vimGrepArgs,vimCmdSep
-syn match	vimGrepadd		"\<l\=grepa\%[dd]\>"	skipwhite nextgroup=vimGrepBang,vimGrepArgs,vimCmdSep
-syn region	vimGrepArgs	contained
-      \ start="|\@!\S"
-      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="$"
-      "\ TODO: include vimSpecFile
-      \ contains=vimGrepBarEscape
-syn match	vimGrepBarEscape	contained	"\\|"
-syn match	vimGrepBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimGrepArgs,vimCmdSep
-
-syn match	vimMake		"\<l\=make\=\>"		skipwhite nextgroup=vimMakeBang,vimMakeArgs,vimCmdSep
-syn region	vimMakeArgs	contained
-      \ start="|\@!\S"
-      \ skip=+\n\s*\%(\\\|[#"]\\ \)+
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="$"
-      "\ TODO: include vimSpecFile
-      \ contains=vimMakeBarEscape
-syn match	vimMakeBarEscape	contained	"\\|"
-syn match	vimMakeBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimMakeArgs,vimCmdSep
-
-" Help*: {{{2
-" =====
-syn match	vimHelp	"\<h\%[elp]\>"	skipwhite nextgroup=vimHelpBang,vimHelpArg,vimHelpNextCommand
-" TODO: match wildcards, ignoring exceptions?
-syn region	vimHelpArg	contained
-      \ start="\S"
-      \ matchgroup=Special
-      \ end="\%(@\a\a\)\=\ze\s*\%($\|\%x0d\|\%x00\||[^|]\)"
-      \ oneline
-syn match	vimHelpNextCommand	contained	"\ze|[^|]"	skipwhite nextgroup=vimCmdSep
-syn match	vimHelpBang		contained	"\a\@1<=!"	skipwhite nextgroup=vimHelpArg,vimHelpNextCommand
-
-syn match	vimHelpgrep		"\<l\=helpg\%[rep]\>"	skipwhite nextgroup=vimHelpgrepBang,vimHelpgrepPattern
-syn region	vimHelpgrepPattern	contained
-      \ start="\S"
-      \ matchgroup=Special
-      \ end="@\a\a\>"
-      \ end="$"
-      \ contains=@vimSubstList
-      \ oneline
-
-" Vimgrep: {{{2
-" =======
-syn match	vimVimgrep		"\<l\=vim\%[grep]\>"	skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern
-syn match	vimVimgrepadd		"\<l\=vimgrepa\%[dd]\>"	skipwhite nextgroup=vimVimgrepBang,vimVimgrepPattern
-syn match	vimVimgrepBang	  contained	"\a\@1<=!"		skipwhite nextgroup=vimVimgrepPattern
-syn region	vimVimgrepPattern   contained
-      \ start="[[:ident:]]"
-      \ end="\ze[[:space:]\n]"
-      \ skipwhite nextgroup=vimVimgrepFile,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-syn region	vimVimgrepPattern   contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:ident:]|"]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=vimVimgrepFlags,vimVimgrepFile,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-syn match	vimVimgrepEscape	  contained	"\\\%(\\|\|.\)"
-syn match	vimVimgrepBarEscape contained	"\\|"
-syn region	vimVimgrepFile	  contained
-      \ start="|\@!\S"
-      \ matchgroup=vimCmdSep
-      \ end="|"
-      \ end="\ze\s"
-      \ end="$"
-      \ skipwhite nextgroup=vimVimgrepFile
-      \ contains=vimSpecFile,vimVimgrepEscape,vimVimgrepBarEscape
-syn match	vimVimgrepFlags	  contained	"\<[gjf]\{,3\}\>" skipwhite nextgroup=vimVimgrepfile
-
-" Maps: {{{2
-" ====
-" GEN_SYN_VIM: vimCommand map, START_STR='syn keyword vimMap', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-syn keyword vimMap cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] om[ap] ono[remap] smap snor[emap] tma[p] tno[remap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapMod,vimMapLhs
-syn match	vimMap	"\<map\>"	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	vimMap	no[remap]	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-" GEN_SYN_VIM: vimCommand mapclear, START_STR='syn keyword vimMap', END_STR='skipwhite nextgroup=vimMapMod'
-syn keyword vimMap cmapc[lear] imapc[lear] lmapc[lear] nmapc[lear] omapc[lear] smapc[lear] tmapc[lear] vmapc[lear] xmapc[lear] skipwhite nextgroup=vimMapMod
-syn keyword	vimMap	mapc[lear]	skipwhite nextgroup=vimMapBang,vimMapMod
-" GEN_SYN_VIM: vimCommand unmap, START_STR='syn keyword vimUnmap', END_STR='skipwhite nextgroup=vimMapMod,vimMapLhs'
-syn keyword vimUnmap cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] tunma[p] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapMod,vimMapLhs
-syn keyword	vimUnmap	unm[ap]	skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-
-syn match	vimMapLhs	contained	"\%(.\|\S\)\+"		contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite        nextgroup=vimMapRhs
-syn match	vimMapLhs	contained	"\%(.\|\S\)\+\ze\s*$"	contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite skipnl nextgroup=vimMapRhsContinue
-syn match	vimMapBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimMapMod,vimMapLhs
-syn match	vimMapMod	contained	"\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
-syn region	vimMapRhs	contained
-      \ start="\S"
-      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader
-syn region	vimMapRhsContinue	contained
-      \ start=+^\s*\%(\\\|["#]\\ \)+
-      \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+
-      \ end="\ze|"
-      \ end="$"
-      \ nextgroup=vimCmdSep
-      \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader
-syn match	vimMapLeader	contained	"\%#=1\c<\%(local\)\=leader>"	contains=vimMapLeaderKey
-syn keyword	vimMapModKey	contained	buffer expr nowait script silent special unique
-syn case ignore
-syn keyword	vimMapLeaderKey	contained	leader localleader
-syn case match
-
-" Menus: {{{2
-" =====
-" NOTE: tail comments disallowed
-" GEN_SYN_VIM: vimCommand menu, START_STR='syn keyword vimMenu', END_STR='skipwhite nextgroup=vimMenuBang,vimMenuMod,vimMenuName,vimMenuPriority,vimMenuStatus'
-syn keyword vimMenu am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] sme[nu] snoreme[nu] sunme[nu] tlm[enu] tln[oremenu] tlu[nmenu] tm[enu] tu[nmenu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] xme[nu] xnoreme[nu] xunme[nu] skipwhite nextgroup=vimMenuBang,vimMenuMod,vimMenuName,vimMenuPriority,vimMenuStatus
-syn keyword vimMenu popu[p] skipwhite nextgroup=vimMenuBang,vimMenuName
-syn region	vimMenuRhs	 contained contains=@vimContinue,vimNotation start="|\@!\S"            skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=vimSep end="|"
-syn region	vimMenuRhsContinue contained contains=@vimContinue,vimNotation start=+^\s*\%(\\\|"\\ \)+ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ end="$" matchgroup=vimSep end="|"
-syn match	vimMenuName	"\.\@!\%(\\\s\|\S\)\+"        contained contains=vimMenuNotation,vimNotation skipwhite        nextgroup=vimCmdSep,vimMenuRhs
-syn match	vimMenuName	"\.\@!\%(\\\s\|\S\)\+\ze\s*$" contained contains=vimMenuNotation,vimNotation skipwhite skipnl nextgroup=vimCmdSep,vimMenuRhsContinue
-syn match	vimMenuNotation	"&\a\|&&\|\\\s\|\\\." contained
-syn match	vimMenuPriority	"\<\d\+\%(\.\d\+\)*\>" contained skipwhite nextgroup=vimMenuName
-syn match	vimMenuMod	"\c<\%(script\|silent\|special\)>" contained skipwhite nextgroup=vimMenuName,vimMenuPriority,vimMenuMod contains=vimMapModKey,vimMapModErr
-syn keyword	vimMenuStatus	enable disable nextgroup=vimMenuName skipwhite
-syn match	vimMenuBang	"\a\@1<=!" contained skipwhite nextgroup=vimMenuName,vimMenuMod
-
-syn region	vimMenutranslate
-      \ matchgroup=vimCommand start="\<menut\%[ranslate]\>"
-      \ skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+
-      \ end="$" matchgroup=vimCmdSep end="|" matchgroup=vimMenuClear end="\<clear\ze\s*\%(["#|]\|$\)"
-      \ contains=@vimContinue,vimMenutranslateName keepend transparent
-" oneline is sufficient to match the current formatting in runtime/lang/*.vim
-syn match	vimMenutranslateName "\%(\\\s\|\S\)\+" contained contains=vimMenuNotation,vimNotation
-syn match	vimMenutranslateComment +".*+ contained containedin=vimMenutranslate
-
-" If, While and Return: {{{2
-" ====================
-syn match	vimNotFunc	"\%#=1\<\%(if\|el\%[seif]\|retu\%[rn]\|while\)\>"	skipwhite nextgroup=@vimExprList,vimNotation
-syn match	vimElse	"\<el\%[se]\>"			skipwhite nextgroup=vimComment,vim9Comment
-syn match	vimEndif	"\<en\%[dif]\>"			skipwhite nextgroup=vimComment,vim9Comment
-
-" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
-" ======================
-syn case ignore
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}x\=\%(f\d\{1,2}\|[^ \t:]\|space\|bar\|bslash\|nl\|newline\|lf\|linefeed\|cr\|retu\%[rn]\|enter\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|csi\|right\|paste\%(start\|end\)\|left\|help\|undo\|k\=insert\|ins\|mouse\|[kz]\=home\|[kz]\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\%(page\)\=\%(\|down\|up\|k\d\>\)\)>" contains=vimBracket
-
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(net\|dec\|jsb\|pterm\|urxvt\|sgr\)mouse>"		contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}\%(left\|middle\|right\)\%(mouse\|drag\|release\)>"	contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}left\%(mouse\|release\)nm>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}x[12]\%(mouse\|drag\|release\)>"		contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}sgrmouserelease>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}mouse\%(up\|down\|move\)>"			contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd2-4]-\)\{0,4}scrollwheel\%(up\|down\|right\|left\)>"		contains=vimBracket
-
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(sid\|nop\|nul\|lt\|drop\)>"				contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%(snr\|plug\|cursorhold\|ignore\|cmd\|scriptcmd\|focus\%(gained\|lost\)\)>"	contains=vimBracket
-" syn match	vimNotation	contained	'\%(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
-syn match	vimNotation	contained	'\%#=1\%(\\\|<lt>\)\=<\%([fq]-\)\=\%(line[12]\|count\|bang\|reg\|args\|mods\|lt\)>'		contains=vimBracket skipwhite nextgroup=vimSubst1
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([cas]file\|abuf\|amatch\|cexpr\|cword\|cWORD\|client\|stack\|script\|sf\=lnum\)>"	contains=vimBracket
-syn match	vimNotation	contained	"\%#=1\%(\\\|<lt>\)\=<\%([scamd]-\)\{0,4}char-\%(\d\+\|0\o\+\|0x\x\+\)>"		contains=vimBracket
-
-syn match	vimBracket contained	"[\\<>]"
-syn case match
-
-" User Command Highlighting: {{{2
-syn match vimUsrCmd	'^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!'
-
-" Vim user commands
-
-" Compiler plugins
-syn match	vimCompilerSet	"\<CompilerSet\>"	skipwhite nextgroup=vimSetArgs
-
-" runtime/makemenu.vim
-syn match	vimSynMenu		"\<SynMenu\>"	skipwhite nextgroup=vimSynMenuPath
-syn match	vimSynMenuPath	contained	".*\ze:"	nextgroup=vimSynMenuColon contains=vimMenuNotation
-syn match	vimSynMenuColon	contained	":"	nextgroup=vimSynMenuName
-syn match	vimSynMenuName	contained	"\w\+"
-
-" runtime/syntax/syncolor.vim
-syn match	vimSynColor		"\<SynColor\>"	skipwhite nextgroup=vimSynColorGroup
-syn match	vimSynColorGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=vimHiKeyList	contains=vimGroup
-syn match	vimSynLink		"\<SynLink\>"	skipwhite nextgroup=vimSynLinkGroup
-syn match	vimSynLinkGroup	contained	"\<\h\w*\>"	skipwhite nextgroup=vimGroup	contains=vimGroup
-
-syn cluster vimExUserCmdList contains=vimCompilerSet,vimSynColor,vimSynLink,vimSynMenu
-
-" Errors And Warnings: {{{2
-" ====================
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
- syn match	vimFunctionError	contained	"[[:space:]!]\@1<=\<[a-z0-9]\w\{-}\ze\s*("
- syn match	vimFunctionError	contained	"\%(<[sS][iI][dD]>\|[sg]:\)\d\w\{-}\ze\s*("
- syn match	vimElseIfErr	"\<else\s\+if\>"
- syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
-endif
-
-" Match: {{{2
-" =====
-syn match	vimMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=vimMatchGroup,vimMatchNone contains=vimCount
-syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=vimMatchPattern
-syn case ignore
-syn keyword	vimMatchNone	contained	none
-syn case match
-syn region	vimMatchPattern	contained
-      \ matchgroup=Delimiter
-      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ contains=@vimSubstList
-      \ oneline
-
-" Normal: {{{2
-" ======
-syn match	vimNormal		"\<norm\%[al]\>!\=" skipwhite nextgroup=vimNormalArg contains=vimBang
-syn region	vimNormalArg	contained	start="\S" skip=+\n\s*\%(\\\|["#]\\ \)+ end="$" contains=@vimContinue
-
-" Profile: {{{2
-" =======
-syn match	vimProfileBang	 contained	"\a\@1<=!"	skipwhite nextgroup=vimProfileArg
-syn keyword	vimProfileArg	 contained	start	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	func	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	file	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfileArg	 contained	stop pause	skipwhite nextgroup=vimCmdSep,@vimComment
-syn keyword	vimProfileArg	 contained	continue dump	skipwhite nextgroup=vimCmdSep,@vimComment
-" TODO: match file pattern
-syn region	vimProfilePattern contained
-      \ start="\S"
-      \ skip=+\\[|"#]+
-      \ end="$" end=+\ze\s*[|"#]+
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-syn match	vimProfile	"\<prof\%[ile]\>"	skipwhite nextgroup=vimProfileBang,vimProfileArg
-
-syn keyword	vimProfdelArg	contained	func	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfdelArg	contained	file	skipwhite nextgroup=vimProfilePattern
-syn keyword	vimProfdelArg	contained	here	skipwhite nextgroup=vimCmdSep,@vimComment
-syn match	vimProfdel	"\<profd\%[el]\>" skipwhite nextgroup=vimProfdelArg
-
-" Prompt{find,repl}: {{{2
-" =================
-syn region	vimPromptArg	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue
-syn keyword	vimPrompt	promptf[ind] promptr[epl]	skipwhite nextgroup=vimPromptArg
-
-" Redir: {{{2
-" =====
-syn match	vimRedir		"\<redir\=\>"	skipwhite nextgroup=vimRedirBang,vimRedirFileOperator,vimRedirVariableOperator,vimRedirRegister,vimRedirEnd
-syn match	vimRedirBang	       contained	"\a\@1<=!"	skipwhite nextgroup=vimRedirFileOperator
-
-syn match	vimRedirFileOperator     contained	">>\="	skipwhite nextgroup=vimRedirFile
-syn region	vimRedirFile	       contained
-      \ start="\S"
-      \ matchgroup=Normal
-      \ end="\s*$"
-      \ end="\s*\ze[|"]"
-      \ nextgroup=vimCmdSep,vimComment
-      \ contains=vimSpecFile
-syn match	vimRedirRegisterOperator contained	">>\="
-syn match	vimRedirRegister	       contained	"@[a-zA-Z*+"]"	nextgroup=vimRedirRegisterOperator
-syn match	vimRedirVariableOperator contained	"=>>\="	skipwhite nextgroup=vimVar
-syn keyword	vimRedirEnd	       contained	END
-
-" Sleep: {{{2
-" =====
-syn keyword	vimSleep		sl[eep]		skipwhite nextgroup=vimSleepBang,vimSleepArg
-syn match	vimSleepBang	contained	"\a\@1<=!"		skipwhite nextgroup=vimSleepArg
-syn match	vimSleepArg	contained	"\<\%(\d\+\)\=m\=\>"
-
-" Sort: {{{2
-" ====
-syn match	vimSort		"\<sort\=\>"			skipwhite nextgroup=vimSortBang,@vimSortOptions,vimSortPattern,vimCmdSep
-syn match	vimSortBang	  contained	"\a\@1<=!"			skipwhite nextgroup=@vimSortOptions,vimSortPattern,vimCmdSep
-syn match	vimSortOptionsError contained	"\a\+"
-syn match	vimSortOptions	  contained	"\<[ilur]*[nfxob]\=[ilur]*\>"		skipwhite nextgroup=vimSortPattern,vimCmdSep
-syn region	vimSortPattern	  contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:alpha:]|]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimSortOptions,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-
-syn cluster vimSortOptions contains=vimSortOptions,vimSortOptionsError
-
-" Terminal: {{{2
-" ========
-syn match	vimTerminal	"\<ter\%[minal]\>"		skipwhite        nextgroup=vimTerminalOptions,vimTerminalCommand
-syn match	vimTerminal	+\<ter\%[minal]\>\ze\s*\n\s*\%(\\\|["#]\\ \)+	skipwhite skipnl nextgroup=vimTerminalOptions,vimTerminalCommand,@vimTerminalContinue
-
-syn match	vimTerminalContinue	contained	"^\s*\\"       	skipwhite skipnl nextgroup=@vimTerminalContinue,vimTerminalOptions,vimTerminalCommand contains=vimWhitespace
-syn match         vimTerminalContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@vimTerminalContinue,vimTerminalOptions,vimTerminalCommand contains=vimWhitespace
-syn cluster	vimTerminalContinue	contains=vimTerminalContinue,vimTerminalContinueComment
-
-syn region	vimTerminalCommand	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimContinue
-
-syn region	vimTerminalOptions	contained
-      \ start="++"
-      \ skip=/\s\+++\|\%(\n\|^\)\s*\%(\\\|["#]\\ \)/
-      \ end="\s"
-      \ end="$"
-      \ skipwhite nextgroup=vimTerminalCommand
-      \ contains=@vimContinue,vimTerminalOption
-      \ transparent
-
-syn match	vimTerminalOption	contained	"++\%(\%(no\)\=close\|open\|curwin\|hidden\|norestore\|shell\)\>"
-syn match	vimTerminalOption	contained	"++kill="		nextgroup=vimTerminalKillOptionArg
-syn match	vimTerminalOption	contained	"++\%(rows\|cols\)="	nextgroup=vimTerminalSizeOptionArg
-syn match	vimTerminalOption	contained	"++eof="		nextgroup=vimTerminalEofOptionArg
-syn match	vimTerminalOption	contained	"++type="		nextgroup=vimTerminalTypeOptionArg
-syn match	vimTerminalOption	contained	"++api="		nextgroup=vimTerminalApiOptionArg
-
-syn match	vimTerminalApiOptionArg	contained	"\<\S\+\>"
-syn match	vimTerminalEofOptionArg	contained	"\<\S\+\>"
-syn match	vimTerminalSizeOptionArg	contained	"\<\d\+\>"
-syn keyword	vimTerminalKillOptionArg	contained	term hup quit int kill
-syn match	vimTerminalKillOptionArg	contained	"\<\d\+\>"
-syn keyword	vimTerminalTypeOptionArg	contained	conpty winpty
-
-" Uniq: {{{2
-" ====
-syn match	vimUniq		"\<uniq\=\>"	skipwhite nextgroup=vimUniqBang,@vimUniqOptions,vimUniqPattern,vimCmdSep
-syn match	vimUniqBang	  contained	"\a\@1<=!"	skipwhite nextgroup=@vimUniqOptions,vimUniqPattern,vimCmdSep
-syn match	vimUniqOptionsError contained	"\a\+"
-syn match	vimUniqOptions	  contained	"\<[ilur]*\>"	skipwhite nextgroup=vimUniqPattern,vimCmdSep
-syn region	vimUniqPattern	  contained
-      \ matchgroup=Delimiter
-      \ start="\z([^[:space:][:alpha:]|]\)"
-      \ skip="\\\\\|\\\z1"
-      \ end="\z1"
-      \ skipwhite nextgroup=@vimUniqOptions,vimCmdSep
-      \ contains=@vimSubstList
-      \ oneline
-
-syn cluster vimUniqOptions contains=vimUniqOptions,vimUniqOptionsError
-
-" Wincmd: {{{2
-" ======
-syn match	vimWincmd	"\<winc\%[md]\>"	skipwhite nextgroup=vimWincmdArg
-" TODO: consider extracting this list from the help file
-syn match	vimWincmdArg	contained
-      \ "\<[sSvnqojkhlwWtbpPrRxKJHLTfFz]\>\|[\^:=\-+_<>|\]}]\|\<g\s\+[\]}]\|\<g[fFtT]\>"
-      \ skipwhite nextgroup=vimCmdSep,vimComment,vim9Comment
-
-" only handles oneline assignments
-Vim9 syn match	vimWincmd	"\s\=\<winc\%[md]\>\ze\s\+=\s*\%([#|]\|$\)"	skipwhite nextgroup=vimWincmdArg
-
-" Syntax: {{{2
-"=======
-syn region	vimGroupList	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      "\ need to consume the whitespace
-      \ end="\s"he=e-1
-      \ end="$"
-      \ contains=@vimGroupListContinue,vimGroupSpecial,vimGroupListContinueComma
-syn keyword	vimGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
-syn match	vimGroupListComma		contained	","
-syn match	vimGroupListContinueComma	contained	"\s\+,\s*\|,\s\+"	contains=vimGroupListComma
-syn match	vimGroupListContinueComma	contained	"\s*,\s*\%(\n\s*\%(\\\s\+\|["#]\\ .*\)\)\+"	contains=@vimGroupListContinue,vimGroupListComma
-
-syn match	vimGroupListEquals	contained	"="		skipwhite skipnl nextgroup=vimGroupListContinueStart,vimGroupList
-" the first continuation line does not terminate the list at whitepace after \
-syn match	vimGroupListContinueStart	contained	"^\%(\s*["#]\\ .*\n\)*\s*\\\s\+"	skipwhite        nextgroup=vimGroupList contains=@vimGroupListContinue transparent
-
-syn match	vimGroupListContinue	contained	"^\s*\\"	skipwhite skipnl nextgroup=@vimGroupListContinue,vimGroupListContinueComma contains=vimWhitespace
-syn match	vimGroupListContinueComment	contained	'^\s*["#]\\ .*'	skipwhite skipnl nextgroup=@vimGroupListContinue		   contains=vimWhitespace
-syn cluster	vimGroupListContinue	contains=vimGroupListContinue,vimGroupListContinueComment
-
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynerror")
- syn match	vimSynError		contained	"\i\+"
-endif
-syn match	vimSynContains		contained	"\<contains\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimSynContainedin		contained	"\<containedin\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimSynNextgroup		contained	"\<nextgroup\>"	skipwhite nextgroup=vimGroupListEquals
-if has("conceal")
- " no whitespace allowed after '='
- syn match	vimSynCchar	contained	"\<cchar="	nextgroup=vimSynCcharValue
- syn match	vimSynCcharValue	contained	"\S"
-endif
-
-syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,@vimComment
-syn cluster vimFunctionBodyList add=vimSyntax
-
-" Syntax: case {{{2
-syn keyword	vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncaseerror")
- syn match	vimSynCaseError	contained	"\i\+"
-endif
-syn keyword	vimSynCase	contained	ignore	match
-
-" Syntax: clear {{{2
-syn keyword	vimSynType	contained	clear
-
-" Syntax: cluster {{{2
-syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
-syn region	vimClusterName	contained keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="$\||" contains=@vimContinue,vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
-syn match	vimGroupAdd	contained	"\<add\>"	skipwhite nextgroup=vimGroupListEquals
-syn match	vimGroupRem	contained	"\<remove\>"	skipwhite nextgroup=vimGroupListEquals
-
-" Syntax: conceal {{{2
-syn match	vimSynType	contained	"\<conceal\>"	skipwhite nextgroup=vimSynConceal,vimSynConcealError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynconcealerror")
- syn match	vimSynConcealError contained	"\i\+"
-endif
-syn keyword	vimSynConceal	contained	on	off
-
-" Syntax: foldlevel {{{2
-syn keyword	vimSynType	contained	foldlevel	skipwhite nextgroup=vimSynFoldlevel,vimSynFoldlevelError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynfoldlevelerror")
- syn match	vimSynFoldlevelError	contained	"\i\+"
-endif
-syn keyword	vimSynFoldlevel	contained	start	minimum
-
-" Syntax: iskeyword {{{2
-syn keyword	vimSynType		contained	iskeyword	skipwhite nextgroup=vimSynIskeyword
-syn keyword	vimSynIskeyword		contained	clear
-syn match	vimSynIskeyword		contained	"\S\+"	contains=vimSynIskeywordSep
-syn match	vimSynIskeywordSep	contained	","
-
-" Syntax: include {{{2
-syn keyword	vimSynType		contained	include	skipwhite nextgroup=vimSynIncludeCluster
-syn match	vimSynIncludeCluster	contained	"@[_a-zA-Z0-9]\+\>"
-
-" Syntax: keyword {{{2
-syn cluster	vimSynKeyGroup	contains=@vimContinue,vimSynCchar,vimSynNextgroup,vimSynKeyOpt,vimSynContainedin
-syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
-syn region	vimSynKeyRegion	contained         keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynKeyGroup
-syn match	vimSynKeyOpt	contained	"\%#=1\<\%(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
-
-" Syntax: match {{{2
-syn cluster	vimSynMtchGroup	contains=@vimContinue,vimSynCchar,vimSynContains,vimSynContainedin,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation,vimMtchComment
-syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
-syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*\>" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynMtchGroup
-syn match	vimSynMtchOpt	contained	"\%#=1\<\%(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
-
-" Syntax: off and on {{{2
-syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
-
-" Syntax: region {{{2
-syn cluster	vimSynRegPatGroup	contains=@vimContinue,vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
-syn cluster	vimSynRegGroup	contains=@vimContinue,vimSynCchar,vimSynContains,vimSynContainedin,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
-syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
-syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=@vimSynRegGroup
-syn match	vimSynRegOpt	contained	"\%#=1\<\%(conceal\%(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
-syn match	vimSynReg	contained	"\<\%(start\|skip\|end\)="	nextgroup=vimSynRegPat
-syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
-syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip=/\\\\\|\\\z1\|\n\s*\%(\\\|"\\ \)/  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
-syn match	vimSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\="
-syn match	vimSynPatMod	contained	"\%#=1\%(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\%([-+]\d\+\)\=," nextgroup=vimSynPatMod
-syn match	vimSynPatMod	contained	"lc=\d\+"
-syn match	vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
-syn region	vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
-syn match	vimSynNotPatRange	contained	"\\\\\|\\\["
-syn match	vimMtchComment	contained	'"[^"]\+$'
-
-" Syntax: spell {{{2
-syn keyword	vimSynType	contained	spell	skipwhite nextgroup=vimSynSpell,vimSynSpellError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynspellerror")
- syn match	vimSynSpellError contained	"\i\+"
-endif
-syn keyword	vimSynSpell	contained	default	notoplevel	toplevel
-
-" Syntax: sync {{{2
-" ============
-syn keyword vimSynType	contained	sync	skipwhite	nextgroup=vimSyncClear,vimSyncMatch,vimSyncError,vimSyncRegion,vimSyncArgs
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncerror")
- syn match	vimSyncError	contained	"\i\+"
-endif
-
-syn region	vimSyncArgs	contained	start="\S" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|\|$" contains=vimSyncLines,vimSyncLinebreak,vimSyncLinecont,vimSyncFromstart,vimSyncCcomment
-
-syn keyword	vimSyncCcomment	contained	ccomment	skipwhite	nextgroup=vimGroupName
-syn keyword	vimSyncClear	contained	clear	skipwhite	nextgroup=vimSyncGroupName
-syn keyword	vimSyncFromstart	contained	fromstart
-syn keyword	vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
-syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynRegion
-syn match	vimSyncLinebreak	contained	"\<linebreaks="		nextgroup=vimNumber
-syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
-syn match	vimSyncLines	contained	"\<lines="		nextgroup=vimNumber
-syn match	vimSyncLines	contained	"\<minlines="		nextgroup=vimNumber
-syn match	vimSyncLines	contained	"\<maxlines="		nextgroup=vimNumber
-syn match	vimSyncGroupName	contained	"\<\h\w*\>"	skipwhite	nextgroup=vimSyncKey
-syn match	vimSyncKey	contained	"\<grouphere\>"	skipwhite	nextgroup=vimSyncGroup
-syn match	vimSyncKey	contained	"\<groupthere\>"	skipwhite	nextgroup=vimSyncGroup
-syn match	vimSyncGroup	contained	"\<\h\w*\>"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
-syn keyword	vimSyncNone	contained	NONE
-
-" Syntime: {{{2
-" =======
-syn keyword	vimSyntimeArg	contained	on off clear report	skipwhite nextgroup=vimComment,vim9Comment,vimCmdSep
-syn keyword	vimSyntime		synti[me]		skipwhite nextgroup=vimSyntimeArg
-" Additional IsCommand: here by reasons of precedence {{{2
-" ====================
-syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
-
-" Highlighting: {{{2
-" ============
-syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,@vimComment
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
- syn match	vimHiCtermError	contained	"\D\i*"
-endif
-syn match	vimHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=vimHiBang,@vimHighlightCluster
-syn match	vimHiBang	contained	"\a\@1<=!"	skipwhite nextgroup=@vimHighlightCluster
-
-syn case ignore
-" Conceal is a generated low-priority match
-syn match	vimHiGroup	contained	"\%(\<Conceal\>\)\@!\i\+"
-syn keyword	vimHiNone	contained	NONE
-syn keyword	vimHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl underdashed underdotted underdouble
-syn keyword	vimFgBgAttrib	contained	none bg background fg foreground
-syn case match
-syn match	vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
-syn match	vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
-syn case ignore
-syn keyword	vimHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey grey40 grey50 grey90 lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred lightyellow magenta red seagreen white yellow
-syn match	vimHiCtermColor	contained	"\<color\d\{1,3}\>"
-syn case match
-
-syn match	vimHiFontname	contained	"[a-zA-Z\-*]\+"
-syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
-syn match	vimHiGuiRgb	contained	"#\x\{6}"
-
-" Highlighting: hi group key=arg ... {{{2
-syn cluster	vimHiCluster contains=vimGroup,vimHLGroup,vimHiGroup,vimHiNone,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiCtermul,vimHiCtermfont,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation,vimComment,vim9comment
-syn region	vimHiKeyList	contained 	start="\i\+" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|" excludenl end="$" contains=@vimContinue,@vimHiCluster
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror")
- syn match	vimHiKeyError	contained	"\i\+="he=e-1
-endif
-syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiStartStop	contained	"\c\%(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
-syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiCtermul	contained	"\cctermul="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiCtermfont	contained	"\cctermfont="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
-syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
-syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
-syn match	vimHiNmbr	contained	'\d\+'
-
-" Highlight: clear {{{2
-syn keyword	vimHiClear	contained	clear	skipwhite nextgroup=vimGroup,vimHLGroup,vimHiGroup
-
-" Highlight: link {{{2
-" see tst24 (hi def vs hi) (Jul 06, 2018)
-"syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
-" TODO: simplify and allow line continuations --djk
-syn region	vimHiLink	contained matchgroup=Type start="\%(\<hi\%[ghlight]!\=\s\+\)\@<=\%(\%(def\%[ault]\s\+\)\=link\>\|\<def\%[ault]\>\)" skip=+\\\\\|\\|\|\n\s*\%(\\\|"\\ \)+ matchgroup=vimCmdSep end="|" excludenl end="$" contains=@vimContinue,@vimHiCluster
-
-" Control Characters: {{{2
-" ==================
-syn match	vimCtrlChar	"[
--]"
-
-" Embedded Scripts:  {{{2
-" ================
-"   perl,ruby	: Benoit Cerrina
-"   python,tcl	: Johannes Zellner
-"   mzscheme, lua : Charles Campbell
-
-" Allows users to specify the type of embedded script highlighting
-" they want:  (lua/mzscheme/perl/python/ruby/tcl support)
-"   g:vimsyn_embed == 0   : don't embed any scripts
-"   g:vimsyn_embed =~# 'l' : embed Lua
-"   g:vimsyn_embed =~# 'm' : embed MzScheme
-"   g:vimsyn_embed =~# 'p' : embed Perl
-"   g:vimsyn_embed =~# 'P' : embed Python
-"   g:vimsyn_embed =~# 'r' : embed Ruby
-"   g:vimsyn_embed =~# 't' : embed Tcl
-
-let s:interfaces = get(g:, "vimsyn_embed", "lP")
-
-" [-- lua --] {{{3
-if s:interfaces =~# 'l'
-  syn include @vimLuaScript syntax/lua.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimLua	lua	skipwhite nextgroup=vimLuaHeredoc,vimLuaStatement
-syn keyword	vimLua	luado	skipwhite nextgroup=vimLuaStatement
-syn keyword	vimLua	luafile
-
-syn region	vimLuaStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimLuaScript,@vimContinue
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimLuaScript
-VimFoldl syn region vimLuaHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimLuaScript
-
-" [-- mzscheme --] {{{3
-if s:interfaces =~# 'm'
-  let s:iskKeep = &l:isk
-  syn include @vimMzSchemeScript syntax/scheme.vim
-  unlet b:current_syntax
-  let &l:isk = s:iskKeep
-endif
-
-syn keyword	vimMzScheme	mz[scheme]	skipwhite nextgroup=vimMzSchemeHeredoc,vimMzSchemeStatement
-syn keyword	vimMzScheme	mzf[ile]
-
-syn region	vimMzSchemeStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimMzSchemeScript,@vimContinue
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimMzSchemeScript
-VimFoldm syn region vimMzSchemeHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimMzSchemeScript
-
-" [-- perl --] {{{3
-if s:interfaces =~# 'p'
-  syn include @vimPerlScript syntax/perl.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPerl	pe[rl]	skipwhite nextgroup=vimPerlHeredoc,vimPerlStatement
-syn keyword	vimPerl	perld[o]	skipwhite nextgroup=vimPerlStatement
-
-syn region	vimPerlStatement	contained
-       \ start="\S"
-       \ skip=+\n\s*\%(\\\|["#]\\ \)+
-       \ end="$"
-       \ contains=@vimPerlScript,@vimContinue
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+<<\s*\z(\S\+\)\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1$+ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+<<\ze\s*$+	matchgroup=vimScriptHeredocStop
-       \ end=+^\.$+
-       \ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1\=\z2$+
-       \ contains=@vimPerlScript
-VimFoldp syn region vimPerlHeredoc	contained
-       \ matchgroup=vimScriptHeredocStart
-       \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-       \ matchgroup=vimScriptHeredocStop
-       \ end=+^\z1\=\.$+
-       \ contains=@vimPerlScript
-
-" [-- python --] {{{3
-if s:interfaces =~# 'P'
-  syn include @vimPythonScript syntax/python2.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPython	py[thon]	skipwhite nextgroup=vimPythonHeredoc,vimPythonStatement
-syn keyword	vimPython	pydo	skipwhite nextgroup=vimPythonStatement
-syn keyword	vimPython	pyfile
-
-syn region	vimPythonStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPythonScript,@vimContinue
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPythonScript
-VimFoldP syn region vimPythonHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPythonScript
-
-" [-- python3 --] {{{3
-if s:interfaces =~# 'P'
-  syn include @vimPython3Script syntax/python.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimPython3	python3 py3	skipwhite nextgroup=vimPython3Heredoc,vimPython3Statement
-syn keyword	vimPython3	py3do	skipwhite nextgroup=vimPython3Statement
-syn keyword	vimPython3	py3file
-
-syn region	vimPython3Statement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPython3Script,@vimContinue
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPython3Script
-VimFoldP syn region vimPython3Heredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPython3Script
-
-" [-- pythonx --] {{{3
-if s:interfaces =~# 'P'
-  if &pyxversion == 2
-    syn cluster vimPythonXScript contains=@vimPythonScript
-  else
-    syn cluster vimPythonXScript contains=@vimPython3Script
-  endif
-endif
-
-syn keyword	vimPythonX	pythonx pyx	skipwhite nextgroup=vimPythonXHeredoc,vimPythonXStatement
-syn keyword	vimPythonX	pyxdo	skipwhite nextgroup=vimPythonXStatement
-syn keyword	vimPythonX	pyxfile
-
-syn region	vimPythonXStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimPythonXScript,@vimContinue
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimPythonXScript
-VimFoldP syn region vimPythonXHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimPythonXScript
-
-" [-- ruby --] {{{3
-if s:interfaces =~# 'r'
-  syn include @vimRubyScript syntax/ruby.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimRuby	rub[y]	skipwhite nextgroup=vimRubyHeredoc,vimRubyStatement
-syn keyword	vimRuby	rubyd[o]	skipwhite nextgroup=vimRubyStatement
-syn keyword	vimRuby	rubyf[ile]
-
-syn region	vimRubyStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimRubyScript,@vimContinue
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+	matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimRubyScript
-VimFoldr syn region vimRubyHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\.$+
-      \ contains=@vimRubyScript
-
-" [-- tcl --] {{{3
-if s:interfaces =~# 't'
-  syn include @vimTclScript syntax/tcl.vim
-  unlet b:current_syntax
-endif
-
-syn keyword	vimTcl	tcl	skipwhite nextgroup=vimTclHeredoc,vimTclStatement
-syn keyword	vimTcl	tcld[o]	skipwhite nextgroup=vimTclStatement
-syn keyword	vimTcl	tclf[ile]
-syn region	vimTclStatement	contained
-      \ start="\S"
-      \ skip=+\n\s*\%(\\\|["#]\\ \)+
-      \ end="$"
-      \ contains=@vimTclScript,@vimContinue
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\s*\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+<<\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\.$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\s\+\z(\S\+\)\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\z2$+
-      \ contains=@vimTclScript
-VimFoldt syn region vimTclHeredoc	contained
-      \ matchgroup=vimScriptHeredocStart
-      \ start=+\%(^\z(\s*\)\S.*\)\@<=<<\s*trim\ze\s*$+
-      \ matchgroup=vimScriptHeredocStop
-      \ end=+^\z1\=\.$+
-      \ contains=@vimTclScript
-
-unlet s:interfaces
-" Function Call Highlighting: {{{2
-" (following Gautam Iyer's suggestion)
-" ==========================
-syn match	vimFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-syn match	vimUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=vimOperParen,vim9TypeArgs
-syn match	vimUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
-syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
-syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
-
-Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
-Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-
-syn cluster	vimFunc	contains=vimFunc,vimUserFunc
-syn cluster	vim9Func	contains=vim9Func,vim9UserFunc
-
-syn region	vim9TypeArgs	contained
-      \ matchgroup=Delimiter
-      \ start="<\ze\a"
-      \ end=">"
-      \ nextgroup=vimOperParen
-      \ contains=@vimType
-      \ oneline
-
-" Beginners - Patterns that involve ^ {{{2
-" =========
-Vim9 syn region	vim9LineComment	start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\%(\\\|#\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString,vim9CommentTitle extend
-VimL syn region	vimLineComment	start=+^[ \t:]*\zs".*$+ skip=+\n\s*\%(\\\|"\\ \)+ end="$" contains=@vimCommentGroup,vimCommentString,vimCommentTitle extend
-
-syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
-syn match	vim9CommentTitle	'#\s*\%([sS]:\|\h\w*#\)\=\%([A-DF-Z]\w*\|E\%(\d\{1,4}\>\)\@!\w*\)\(\s\+\u\w*\)*:'hs=s+1	contained contains=vim9CommentTitleLeader,vimTodo,@vimCommentGroup
-
-" allowed anywhere in the file
-if !s:vim9script
-  syn match	vimShebangError	"^\s*\zs#!.*" display
-endif
-syn match	vimShebang	"\%^#!.*" display
-
-syn match	vimContinue		"^\s*\zs\\"
-syn match	vimContinueComment	'^\s*\zs["#]\\ .*' extend
-syn match	vim9ContinueComment	"^\s*\zs#\\ .*"	 extend
-syn cluster	vimContinue	contains=vimContinue,vimContinueComment
-syn cluster	vim9Continue	contains=vimContinue,vim9ContinueComment
-
-syn region	vimString	start='^\s*\\"' end='"' oneline keepend contains=@vimStringGroup,vimContinue
-syn region	vimString	start="^\s*\\'" end="'" oneline keepend contains=vimQuoteEscape,vimContinue
-
-syn match	vimCommentTitleLeader	'"\s\+'ms=s+1	contained
-syn match	vim9CommentTitleLeader	'#\s\+'ms=s+1	contained
-
-" Searches And Globals: {{{2
-" ====================
-VimL syn match	vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
-syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
-Vim9 syn match	vim9Search	'^\s*:[/?].*'		contains=vim9SearchDelim
-syn match	vim9SearchDelim	'^\s*\zs:[/?]\|[/?]$'	contained contains=vimCmdSep
-syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
-syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst1
-
-" Vim9 script Regions: {{{2
-" ==================
-
-if s:vim9script
-  syn cluster vimLegacyTop	contains=TOP,vim9LegacyHeader,vim9Comment,vim9LineComment
-  VimFoldH syn region vim9LegacyHeader start="\%^" end="^\ze\s*vim9s\%[cript]\>" contains=@vimLegacyTop,vimComment,vimLineComment
-
-  syn keyword vim9Vim9ScriptArg	noclear contained
-  syn keyword vim9Vim9Script	vim9s[cript] nextgroup=vim9Vim9ScriptArg skipwhite
-endif
-
-" Synchronize (speed) {{{2
-"============
-
-exe "syn sync minlines=" .. get(g:, "vimsyn_minlines", 100)
-exe "syn sync maxlines=" .. get(g:, "vimsyn_maxlines", 200)
-
-syn sync linecont	"^\s\+\\"
-syn sync linebreaks=2
-syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
-
-" ====================
-" Highlighting Settings {{{2
-" ====================
-
-if !exists("skip_vim_syntax_inits")
- if !exists("g:vimsyn_noerror")
-  hi def link vimBehaveError	vimError
-  hi def link vimCollClassErr	vimError
-  hi def link vimErrSetting	vimError
-  hi def link vimFTError	vimError
-  hi def link vimFunctionError	vimError
-  hi def link vimFunc         	vimError
-  hi def link vim9Func         	vimError
-  hi def link vimHiAttribList	vimError
-  hi def link vimHiCtermError	vimError
-  hi def link vimHiKeyError	vimError
-  hi def link vimMapModErr	vimError
-  hi def link vimMarkArgError	vimError
-  hi def link vimShebangError	vimError
-  hi def link vimSortOptionsError	Error
-  hi def link vimSubstFlagErr	vimError
-  hi def link vimSynCaseError	vimError
-  hi def link vimSyncError	vimError
-  hi def link vimSynConcealError	vimError
-  hi def link vimSynError	vimError
-  hi def link vimSynFoldlevelError	vimError
-  hi def link vimSynIskeywordError	vimError
-  hi def link vimSynSpellError	vimError
-  hi def link vimBufnrWarn	vimWarn
-
-  hi def link vim9TypeAliasError	vimError
- endif
-
- hi def link vimAbb	vimCommand
- hi def link vimAddress	vimMark
- hi def link vimAt	vimCommand
- hi def link vimAtArg	Special
- hi def link vimAugroupBang	vimBang
- hi def link vimAugroupError	vimError
- hi def link vimAugroupKey	vimCommand
- hi def link vimAutocmd	vimCommand
- hi def link vimAutocmdBang	vimBang
- hi def link vimAutocmdPatternEscape	Special
- hi def link vimAutoEvent	Type
- hi def link vimAutoEventGlob	Type
- hi def link vimAutocmdBufferPattern	Special
- hi def link vimAutocmdMod	Special
- hi def link vimAutocmdPatternSep	vimSep
- hi def link vimBang	vimOper
- hi def link vimBehaveBang	vimBang
- hi def link vimBehaveModel	vimBehave
- hi def link vimBehave	vimCommand
- hi def link vimBracket	Delimiter
- hi def link vimBreakaddFunc	Special
- hi def link vimBreakaddFile	Special
- hi def link vimBreakaddHere	Special
- hi def link vimBreakaddExpr	Special
- hi def link vimBreakpointGlob	Special
- hi def link vimBreakadd	vimCommand
- hi def link vimBreakdel	vimCommand
- hi def link vimBreaklist	vimCommand
- hi def link vimCall	vimCommand
- hi def link vimCatch	vimCommand
- hi def link vimCd	vimCommand
- hi def link vimCdBang	vimBang
- hi def link vimCmplxRepeat	SpecialChar
- hi def link vimCommand	Statement
- hi def link vimCommandModifier	vimCommand
- hi def link vimCommandModifierBang	vimBang
- hi def link vimComment	Comment
- hi def link vimCommentError	vimError
- hi def link vimCommentString	vimString
- hi def link vimCommentTitle	PreProc
- hi def link vimCondHL	vimCommand
- hi def link vimConst	vimCommand
- hi def link vimContinue	Special
- hi def link vimContinueComment	vimComment
- hi def link vimContinueString	vimString
- hi def link vimCount	Number
- hi def link vimCtrlChar	SpecialChar
- hi def link vimDebug	vimCommand
- hi def link vimDebuggreedy	vimCommand
- hi def link vimDef	vimCommand
- hi def link vimDefBang	vimBang
- hi def link vimDefComment	vim9Comment
- hi def link vimDefer	vimCommand
- hi def link vimDefParam	vimVar
- hi def link vimDelcommand	vimCommand
- hi def link vimDelcommandAttr	vimUserCmdAttr
- hi def link vimDelfunction	vimCommand
- hi def link vimDelfunctionBang	vimBang
- hi def link vimDoautocmd	vimCommand
- hi def link vimDoautocmdMod	Special
- hi def link vimDoCommand	vimCommand
- hi def link vimDoCommandBang	vimBang
- hi def link vimEcho	vimCommand
- hi def link vimEchohlNone	vimGroup
- hi def link vimEchohl	vimCommand
- hi def link vimElse	vimCommand
- hi def link vimElseIfErr	Error
- hi def link vimEndfunction	vimCommand
- hi def link vimEnddef	vimCommand
- hi def link vimEndif	vimCommand
- hi def link vimEnvvar	PreProc
- hi def link vimError	Error
- hi def link vimEscape	Special
- hi def link vimEval	vimCommand
- hi def link vimExFilter	vimCommand
- hi def link vimExFilterBang	vimBang
- hi def link vimExMark	vimCommand
- hi def link vimFBVar	vimVar
- hi def link vimFgBgAttrib	vimHiAttrib
- hi def link vimFuncEcho	vimCommand
- hi def link vimFor	vimCommand
- hi def link vimForInContinue	vimContinue
- hi def link vimForInContinueComment	vimContinueComment
- hi def link vimFTCmd	vimCommand
- hi def link vimFTOption	vimSynType
- hi def link vimFunction	vimCommand
- hi def link vimFunctionBang	vimBang
- hi def link vimFunctionComment	vimComment
- hi def link vimFuncName	Function
- hi def link vimFunctionMod	Special
- hi def link vimFunctionParam	vimVar
- hi def link vimFunctionParamEquals	vimOper
- hi def link vimFunctionScope	vimVarScope
- hi def link vimFunctionSID	vimNotation
- hi def link vimGrep	vimCommand
- hi def link vimGrepadd	vimCommand
- hi def link vimGrepBang	vimBang
- hi def link vimGroup	Type
- hi def link vimGroupAdd	vimSynOption
- hi def link vimGroupListEquals	vimSynOption
- hi def link vimGroupListContinue		vimContinue
- hi def link vimGroupListContinueComment	vimContinueComment
- hi def link vimGroupName	Normal
- hi def link vimGroupRem	vimSynOption
- hi def link vimGroupSpecial	Special
- hi def link vimHelp	vimCommand
- hi def link vimHelpBang	vimBang
- hi def link vimHelpgrep	vimCommand
- hi def link vimHiAttrib	PreProc
- hi def link vimHiBang	vimBang
- hi def link vimHiClear	Type
- hi def link vimHiCtermColor	Constant
- hi def link vimHiCtermFgBg	vimHiTerm
- hi def link vimHiCtermfont	vimHiTerm
- hi def link vimHiCtermul	vimHiTerm
- hi def link vimHiCTerm	vimHiTerm
- hi def link vimHighlight	vimCommand
- hi def link vimHiGroup	vimGroupName
- hi def link vimHiGuiFgBg	vimHiTerm
- hi def link vimHiGuiFont	vimHiTerm
- hi def link vimHiGuiRgb	vimNumber
- hi def link vimHiGui	vimHiTerm
- hi def link vimHiNmbr	Number
- hi def link vimHiNone	vimGroup
- hi def link vimHiStartStop	vimHiTerm
- hi def link vimHiTerm	Type
- hi def link vimHLGroup	vimGroup
- hi def link vimHistory	vimCommand
- hi def link vimHistoryName	Special
- hi def link vimImport	vimCommand
- hi def link vimImportAutoload	Special
- hi def link vimImportAs	vimImport
- hi def link vimInsert	vimString
- hi def link vim9KeymapLineComment	vimKeymapLineComment
- hi def link vimKeymapLineComment	vimComment
- hi def link vimKeymapTailComment	vimComment
- hi def link vimLambdaBrace	Delimiter
- hi def link vimLambdaOperator	vimOper
- hi def link vimLanguage	vimCommand
- hi def link vimLanguageCategory	Special
- hi def link vimLanguageNameReserved	Constant
- hi def link vimLet	vimCommand
- hi def link vimLetHeredoc	vimString
- hi def link vimLetHeredocStart	Special
- hi def link vimLetHeredocStop	Special
- hi def link vimLetRegister	vimRegister
- hi def link vimLineComment	vimComment
- hi def link vimLua	vimCommand
- hi def link vimMake	vimCommand
- hi def link vimMakeadd	vimCommand
- hi def link vimMakeBang	vimBang
- hi def link vimMapBang	vimBang
- hi def link vimMapLeader	vimBracket
- hi def link vimMapLeaderKey	vimNotation
- hi def link vimMapModKey	vimFunctionSID
- hi def link vimMapMod	vimBracket
- hi def link vimMap	vimCommand
- hi def link vimMark	Number
- hi def link vimMarkNumber	vimNumber
- hi def link vimMatch	vimCommand
- hi def link vimMatchGroup	vimGroup
- hi def link vimMatchNone	vimGroup
- hi def link vimMenuBang	vimBang
- hi def link vimMenuClear	Special
- hi def link vimMenuMod	vimMapMod
- hi def link vimMenuName	PreProc
- hi def link vimMenu	vimCommand
- hi def link vimMenuNotation	vimNotation
- hi def link vimMenuPriority	Number
- hi def link vimMenuStatus	Special
- hi def link vimMenutranslateComment	vimComment
- hi def link vim9MethodName	vimFuncName
- hi def link vimMtchComment	vimComment
- hi def link vimMzScheme	vimCommand
- hi def link vimNonText	NonText
- hi def link vimNormal	vimCommand
- hi def link vimNotation	Special
- hi def link vimNotFunc	vimCommand
- hi def link vimNotPatSep	vimString
- hi def link vimNumber	Number
- hi def link vimOperError	Error
- hi def link vimOper	Operator
- hi def link vimOperContinue	vimContinue
- hi def link vimOperContinueComment	vimContinueComment
- hi def link vimOption	PreProc
- hi def link vimOptionVar	Identifier
- hi def link vimOptionVarName	Identifier
- hi def link vimParenSep	Delimiter
- hi def link vimPatSepErr	vimError
- hi def link vimPatSepR	vimPatSep
- hi def link vimPatSep	SpecialChar
- hi def link vimPatSepZone	vimString
- hi def link vimPatSepZ	vimPatSep
- hi def link vimPattern	Type
- hi def link vimPerl	vimCommand
- hi def link vimPlainMark	vimMark
- hi def link vimProfile	vimCommand
- hi def link vimProfileArg	vimSpecial
- hi def link vimProfileBang	vimBang
- hi def link vimProfdel	vimCommand
- hi def link vimProfdelArg	vimSpecial
- hi def link vimPrompt	vimCommand
- hi def link vimPython	vimCommand
- hi def link vimPython3	vimCommand
- hi def link vimPythonX	vimCommand
- hi def link vimQuoteEscape	vimEscape
- hi def link vimRedir	vimCommand
- hi def link vimRedirBang	vimBang
- hi def link vimRedirFileOperator	vimOper
- hi def link vimRedirRegisterOperator	vimOper
- hi def link vimRedirVariableOperator	vimOper
- hi def link vimRedirEnd	Special
- hi def link vimRedirRegister	vimRegister
- hi def link vimRegister	SpecialChar
- hi def link vimRuby	vimCommand
- hi def link vimScriptDelim	Comment
- hi def link vimScriptHeredocStart	vimLetHeredocStart
- hi def link vimScriptHeredocStop	vimLetHeredocStop
- hi def link vimSearch	vimString
- hi def link vimSearchDelim	Delimiter
- hi def link vimSep	Delimiter
- hi def link vimSet	vimCommand
- hi def link vimSetAll	vimOption
- hi def link vimSetBang	vimBang
- hi def link vimSetComment	vimComment
- hi def link vimSetMod	vimOption
- hi def link vimSetSep	vimSep
- hi def link vimSetTermcap	vimOption
- hi def link vimShebang	PreProc
- hi def link vimSleep	vimCommand
- hi def link vimSleepArg	Constant
- hi def link vimSleepBang	vimBang
- hi def link vimSort	vimCommand
- hi def link vimSortBang	vimBang
- hi def link vimSortOptions	Special
- hi def link vimSpecFile	Identifier
- hi def link vimSpecFileMod	vimSpecFile
- hi def link vimSpecial	Type
- hi def link vimStringCont	vimString
- hi def link vimString	String
- hi def link vimStringEnd	vimString
- hi def link vimStringInterpolationBrace	vimEscape
- hi def link vimSubst1	vimSubst
- hi def link vimSubstCount	Number
- hi def link vimSubstDelim	Delimiter
- hi def link vimSubstFlags	Special
- hi def link vimSubstSubstr	SpecialChar
- hi def link vimSubstTwoBS	vimString
- hi def link vimSubst	vimCommand
- hi def link vimSynCase	Type
- hi def link vimSyncCcomment	Type
- hi def link vimSynCchar	vimSynOption
- hi def link vimSynCcharValue	Character
- hi def link vimSyncClear	Type
- hi def link vimSyncFromstart	Type
- hi def link vimSyncGroup	vimGroupName
- hi def link vimSyncGroupName	vimGroupName
- hi def link vimSyncKey	Type
- hi def link vimSyncLinebreak	Type
- hi def link vimSyncLinecont	Type
- hi def link vimSyncLines	Type
- hi def link vimSyncMatch	Type
- hi def link vimSyncNone	Type
- hi def link vimSynConceal	Type
- hi def link vimSynContains	vimSynOption
- hi def link vimSyncRegion	Type
- hi def link vimSynFoldlevel	Type
- hi def link vimSynIskeyword	Type
- hi def link vimSynIskeywordSep	Delimiter
- hi def link vimSynContainedin	vimSynContains
- hi def link vimSynKeyOpt	vimSynOption
- hi def link vimSynMtchGrp	vimSynOption
- hi def link vimSynMtchOpt	vimSynOption
- hi def link vimSynNextgroup	vimSynOption
- hi def link vimSynNotPatRange	vimSynRegPat
- hi def link vimSynOption	Special
- hi def link vimSynPatRange	vimString
- hi def link vimSynReg	Type
- hi def link vimSynRegOpt	vimSynOption
- hi def link vimSynRegPat	vimString
- hi def link vimSynSpell	Type
- hi def link vimSyntax	vimCommand
- hi def link vimSynType	vimSpecial
- hi def link vimSyntime	vimCommand
- hi def link vimSyntimeArg	vimSpecial
- hi def link vimTcl	vimCommand
- hi def link vimTerminal	vimCommand
- hi def link vimTerminalContinue	vimContinue
- hi def link vimTerminalContinueComment	vimContinueComment
- hi def link vimTerminalOption		vimSpecial
- hi def link vimTerminalKillOptionArg	Constant
- hi def link vimTerminalSizeOptionArg	Constant
- hi def link vimTerminalTypeOptionArg	Constant
- hi def link vimThrow	vimCommand
- hi def link vimTodo	Todo
- hi def link vimType	Type
- hi def link vimTypeAny	vimType
- hi def link vimTypeObject	vimType
- hi def link vimTypeObjectBracket	vimTypeObject
- hi def link vimUniq	vimCommand
- hi def link vimUniqBang	vimBang
- hi def link vimUniqOptions	Special
- hi def link vimUnlet	vimCommand
- hi def link vimUnletBang	vimBang
- hi def link vimUnmap	vimMap
- hi def link vimUserCmd	vimCommand
- hi def link vimUserCmdAttrAddr	vimSpecial
- hi def link vimUserCmdAttrComplete	vimSpecial
- hi def link vimUserCmdAttrCompleteFunc	vimVar
- hi def link vimUserCmdAttrNargs	vimSpecial
- hi def link vimUserCmdAttrRange	vimSpecial
- hi def link vimUserCmdAttrKey	vimUserCmdAttr
- hi def link vimUserCmdAttr	Special
- hi def link vimUserCmdAttrError	Error
- hi def link vimUserCmdError	Error
- hi def link vimUserCmdKey	vimCommand
- hi def link vimUserFunc	Normal
- hi def link vimVar	Normal
- hi def link vimVarScope	Identifier
- hi def link vimVimgrep	vimCommand
- hi def link vimVimgrepadd	vimCommand
- hi def link vimVimgrepBang	vimBang
- hi def link vimVimgrepFlags	Special
- hi def link vimVimVar	Identifier
- hi def link vimVimVarName	Identifier
- hi def link vimWarn	WarningMsg
- hi def link vimWildcard	Special
- hi def link vimWildcardBraceComma	vimWildcard
- hi def link vimWildcardBracket	vimWildcard
- hi def link vimWildcardBracketCaret	vimWildcard
- hi def link vimWildcardBracketCharacter	Normal
- hi def link vimWildcardBracketCharacter	Normal
- hi def link vimWildcardBracketCharacterClass	vimWildCard
- hi def link vimWildcardBracketCollatingSymbol	vimWildCard
- hi def link vimWildcardBracketEnd		vimWildcard
- hi def link vimWildcardBracketEquivalenceClass	vimWildCard
- hi def link vimWildcardBracketEscape	vimWildcard
- hi def link vimWildcardBracketHyphen	vimWildcard
- hi def link vimWildcardBracketRightBracket	vimWildcardBracketCharacter
- hi def link vimWildcardBracketStart	vimWildcard
- hi def link vimWildcardEscape	vimWildcard
- hi def link vimWildcardInterval	vimWildcard
- hi def link vimWildcardQuestion	vimWildcard
- hi def link vimWildcardStar	vimWildcard
- hi def link vimWinCmd	vimCommand
-
- hi def link vim9Abstract	vimCommand
- hi def link vim9Boolean	Boolean
- hi def link vim9Class	vimCommand
- hi def link vim9Comment	Comment
- hi def link vim9CommentError	vimError
- hi def link vim9CommentTitle	PreProc
- hi def link vim9ConstructorDefParam	vimVar
- hi def link vim9Const	vimCommand
- hi def link vim9ContinueComment	vimContinueComment
- hi def link vim9Enum	vimCommand
- hi def link vim9EnumImplementedInterfaceComment	vim9Comment
- hi def link vim9EnumImplements	vim9Implements
- hi def link vim9EnumNameComment	vim9Comment
- hi def link vim9EnumNameContinue	vimContinue
- hi def link vim9EnumNameContinueComment	vim9Comment
- hi def link vim9EnumValueListCommaComment	vim9Comment
- hi def link vim9Export	vimCommand
- hi def link vim9Extends	Keyword
- hi def link vim9Final	vimCommand
- hi def link vim9For	vimCommand
- hi def link vim9ForInComment	vim9Comment
- hi def link vim9Implements	Keyword
- hi def link vim9AbstractDef	vimCommand
- hi def link vim9Interface	vimCommand
- hi def link vim9LambdaOperator	vimOper
- hi def link vim9LambdaOperatorComment	vim9Comment
- hi def link vim9LambdaParen	vimParenSep
- hi def link vim9LhsRegister	vimLetRegister
- hi def link vim9LhsVariable	vimVar
- hi def link vim9LineComment	vimComment
- hi def link vim9MethodDef	vimCommand
- hi def link vim9MethodDefComment	vimDefComment
- hi def link vim9MethodNameError	vimFunctionError
- hi def link vim9Null	Constant
- hi def link vim9Public	vimCommand
- hi def link vim9Search	vimString
- hi def link vim9SearchDelim	Delimiter
- hi def link vim9Static	vimCommand
- hi def link vim9Super	Identifier
- hi def link vim9This	Identifier
- hi def link vim9Type	vimCommand
- hi def link vim9TypeEquals	vimOper
- hi def link vim9Variable	vimVar
- hi def link vim9VariableType	vimType
- hi def link vim9VariableTypeAny	vimTypeAny
- hi def link vim9VariableTypeObject	vimTypeObject
- hi def link vim9VariableTypeObjectBracket	vimTypeObjectBracket
- hi def link vim9Var	vimCommand
- hi def link vim9Vim9ScriptArg	Special
- hi def link vim9Vim9Script	vimCommand
-
- hi def link vimCompilerSet	vimCommand
- hi def link vimSynColor vimCommand
- hi def link vimSynLink vimCommand
- hi def link vimSynMenu	vimCommand
- hi def link vimSynMenuPath	vimMenuName
-endif
-
-" Current Syntax Variable: {{{2
-let b:current_syntax = "vim"
-
-" ---------------------------------------------------------------------
-" Cleanup: {{{1
-delc Vim9
-delc VimL
-delc VimFolda
-delc VimFoldc
-delc VimFolde
-delc VimFoldf
-delc VimFoldh
-delc VimFoldH
-delc VimFoldi
-delc VimFoldl
-delc VimFoldm
-delc VimFoldp
-delc VimFoldP
-delc VimFoldr
-delc VimFoldt
-let &cpo = s:keepcpo
-unlet s:keepcpo s:vim9script
-" vim:ts=18 fdm=marker ft=vim
diff --git a/uvim/runtime/syntax/viminfo.vim b/uvim/runtime/syntax/viminfo.vim
deleted file mode 100644
index 06c59766d7..0000000000
--- a/uvim/runtime/syntax/viminfo.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-" Vim syntax file
-" Language:	Vim .viminfo file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
-
-" Quit when a (custom) syntax file was already loaded
-if exists("b:current_syntax")
-  finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" The lines that are NOT recognized
-syn match viminfoError "^[^\t].*"
-
-" The one-character one-liners that are recognized
-syn match viminfoStatement "^[/&$@:?=%!<]"
-
-" The two-character one-liners that are recognized
-syn match viminfoStatement "^[-'>"]."
-syn match viminfoStatement +^"".+
-syn match viminfoStatement "^\~[/&]"
-syn match viminfoStatement "^\~[hH]"
-syn match viminfoStatement "^\~[mM][sS][lL][eE]\d\+\~\=[/&]"
-
-syn match viminfoOption "^\*.*=" contains=viminfoOptionName
-syn match viminfoOptionName "\*\a*"ms=s+1 contained
-
-" Comments
-syn match viminfoComment "^#.*"
-
-" New style lines.  TODO: highlight numbers and strings.
-syn match viminfoNew "^|.*"
-
-" Define the default highlighting.
-" Only used when an item doesn't have highlighting yet
-hi def link viminfoComment	Comment
-hi def link viminfoError	Error
-hi def link viminfoStatement	Statement
-hi def link viminfoNew		String
-
-let b:current_syntax = "viminfo"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: ts=8 sw=2
diff --git a/uvim/runtime/syntax/virata.vim b/uvim/runtime/syntax/virata.mnv
index 0ed54fa899..83b53a967a 100644
--- a/uvim/runtime/syntax/virata.vim
+++ b/uvim/runtime/syntax/virata.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Virata AConfig Configuration Script
 " Maintainer:	Manuel M.H. Stol	<mmh.stol@gmx.net>
 " Last Change:	2003 May 11
-" Vim URL:	http://www.vim.org/lang.html
+" MNV URL:	http://www.mnv.org/lang.html
 " Virata URL:	http://www.globespanvirata.com/
 
 
@@ -204,4 +204,4 @@ hi def link virataDirective	Keyword
 
 let b:current_syntax = "virata"
 
-" vim:ts=8:sw=2:noet:
+" mnv:ts=8:sw=2:noet:
diff --git a/uvim/runtime/syntax/vmasm.vim b/uvim/runtime/syntax/vmasm.mnv
index c5cbb1e3a2..3d0d390f6e 100644
--- a/uvim/runtime/syntax/vmasm.vim
+++ b/uvim/runtime/syntax/vmasm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	(VAX) Macro Assembly
 " Maintainer:	Tom Uijldert <tom.uijldert [at] cmg.nl>
 " Last change:	2004 May 16
@@ -235,4 +235,4 @@ hi def link vmasmLabel		Type
 
 let b:current_syntax = "vmasm"
 
-" vim: ts=8 sw=2
+" mnv: ts=8 sw=2
diff --git a/uvim/runtime/syntax/voscm.vim b/uvim/runtime/syntax/voscm.mnv
index 7d6bea7543..7d4333f348 100644
--- a/uvim/runtime/syntax/voscm.vim
+++ b/uvim/runtime/syntax/voscm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	VOS CM macro
 " Maintainer:	Andrew McGill andrewm at lunch.za.net
 " Last Change:	Apr 06, 2007
@@ -91,4 +91,4 @@ hi def link voscmError         	Error
 
 let b:current_syntax = "voscm"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vrml.vim b/uvim/runtime/syntax/vrml.mnv
index 2474493c94..0d2a55ff6e 100644
--- a/uvim/runtime/syntax/vrml.vim
+++ b/uvim/runtime/syntax/vrml.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	   VRML97
 " Modified from:   VRML 1.0C by David Brown <dbrown@cgs.c4.gmeds.com>
 " Maintainer:	   vacancy!
-" Former Maintainer:    Gregory Seidman <gsslist+vim@anthropohedron.net>
+" Former Maintainer:    Gregory Seidman <gsslist+mnv@anthropohedron.net>
 " Last change:	   2006 May 03
 
 " quit when a syntax file was already loaded
@@ -166,7 +166,7 @@ syn keyword VRMLProtos	       contained EXTERNPROTO PROTO IS
 syn keyword VRMLRoutes	       contained ROUTE TO
 
 "containment!
-syn include @jscript $VIMRUNTIME/syntax/javascript.vim
+syn include @jscript $MNVRUNTIME/syntax/javascript.mnv
 syn region VRMLjScriptString contained start=+"\(\(javascript\)\|\(vrmlscript\)\|\(ecmascript\)\):+ms=e+1 skip=+\\\\\|\\"+ end=+"+me=e-1 contains=@jscript
 
 " match definitions.
@@ -219,4 +219,4 @@ hi def link VRMLTypes      Identifier
 
 let b:current_syntax = "vrml"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/vroom.vim b/uvim/runtime/syntax/vroom.mnv
index 0509e30b17..351404151a 100644
--- a/uvim/runtime/syntax/vroom.vim
+++ b/uvim/runtime/syntax/vroom.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
-" Language:	Vroom (vim testing and executable documentation)
-" Maintainer:	David Barnett (https://github.com/google/vim-ft-vroom)
+" MNV syntax file
+" Language:	Vroom (mnv testing and executable documentation)
+" Maintainer:	David Barnett (https://github.com/google/mnv-ft-vroom)
 " Last Change:	2014 Jul 23
 
 " quit when a syntax file was already loaded
@@ -12,8 +12,8 @@ let s:cpo_save = &cpo
 set cpo-=C
 
 
-syn include @vroomVim syntax/vim.vim
-syn include @vroomShell syntax/sh.vim
+syn include @vroomMNV syntax/mnv.mnv
+syn include @vroomShell syntax/sh.mnv
 
 syntax region vroomAction
     \ matchgroup=vroomOutput
@@ -35,11 +35,11 @@ syntax region vroomMessageBody
 syntax region vroomColoredAction
     \ matchgroup=vroomInput
     \ start='\m^  > ' end='\m$' keepend
-    \ contains=vimNotation,vroomControlBlock
+    \ contains=mnvNotation,vroomControlBlock
 syntax region vroomAction
     \ matchgroup=vroomInput
     \ start='\m^  % ' end='\m$' keepend
-    \ contains=vimNotation,vroomControlBlock
+    \ contains=mnvNotation,vroomControlBlock
 
 syntax region vroomAction
     \ matchgroup=vroomContinuation
@@ -47,7 +47,7 @@ syntax region vroomAction
 
 syntax region vroomAction
     \ start='\m^  \ze:' end='\m$' keepend
-    \ contains=@vroomVim,vroomControlBlock
+    \ contains=@vroomMNV,vroomControlBlock
 
 syntax region vroomAction
     \ matchgroup=vroomDirective
diff --git a/uvim/runtime/syntax/vsejcl.vim b/uvim/runtime/syntax/vsejcl.mnv
index f329836236..e5d851ba36 100644
--- a/uvim/runtime/syntax/vsejcl.vim
+++ b/uvim/runtime/syntax/vsejcl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:    JCL job control language - DOS/VSE
 " Maintainer:  Davyd Ondrejko <david.ondrejko@safelite.com>
 " URL:
@@ -33,4 +33,4 @@ hi def link vsejclParms		Constant
 
 let b:current_syntax = "vsejcl"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/vue.vim b/uvim/runtime/syntax/vue.mnv
index bad0e26c42..2fde9ae393 100644
--- a/uvim/runtime/syntax/vue.vim
+++ b/uvim/runtime/syntax/vue.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Vue.js Single File Component
 " Maintainer:	Ralph Giles <giles@thaumas.net>
 " URL:		https://vuejs.org/v2/guide/single-file-components.html
@@ -11,4 +11,4 @@ endif
 
 " We have a collection of html, css and javascript wrapped in
 " tags. The default HTML syntax highlight works well enough.
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
diff --git a/uvim/runtime/syntax/wat.vim b/uvim/runtime/syntax/wat.mnv
index a6b926be98..2e21507070 100644
--- a/uvim/runtime/syntax/wat.vim
+++ b/uvim/runtime/syntax/wat.mnv
@@ -1,15 +1,15 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     WebAssembly
 " Maintainer:   rhysd <lin90162@yahoo.co.jp>
 " Last Change:  Nov 14, 2023
-" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+" For bugs, patches and license go to https://github.com/rhysd/mnv-wasm
 
 if exists("b:current_syntax")
     finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn cluster watNotTop contains=watModule,watInstWithType,watInstGetSet,watInstGeneral,watParamInst,watControlInst,watSimdInst,watString,watNamedVar,watUnnamedVar,watFloat,watNumber,watComment,watList,watType
 
diff --git a/uvim/runtime/syntax/wdiff.vim b/uvim/runtime/syntax/wdiff.mnv
index d0afadff2f..1d8726bfd2 100644
--- a/uvim/runtime/syntax/wdiff.vim
+++ b/uvim/runtime/syntax/wdiff.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     wDiff (wordwise diff)
 " Maintainer:   Gerfried Fuchs <alfie@ist.org>
 " Last Change:  25 Apr 2001
-" URL:		http://alfie.ist.org/vim/syntax/wdiff.vim
+" URL:		http://alfie.ist.org/mnv/syntax/wdiff.mnv
 "
 " Comments are very welcome - but please make sure that you are commenting on
 " the latest version of this file.
diff --git a/uvim/runtime/syntax/wdl.vim b/uvim/runtime/syntax/wdl.mnv
index 3b8369e8bd..9d1750398d 100644
--- a/uvim/runtime/syntax/wdl.vim
+++ b/uvim/runtime/syntax/wdl.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	wdl
 " Maintainer:	Matt Dunford (zenmatic@gmail.com)
-" URL:		https://github.com/zenmatic/vim-syntax-wdl
+" URL:		https://github.com/zenmatic/mnv-syntax-wdl
 " Last Change:	2022 Nov 24
 
 " https://github.com/openwdl/wdl
diff --git a/uvim/runtime/syntax/web.vim b/uvim/runtime/syntax/web.mnv
index 54eebda399..ab45304af9 100644
--- a/uvim/runtime/syntax/web.vim
+++ b/uvim/runtime/syntax/web.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	WEB
 " Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
 " Last Change:	April 30, 2001
@@ -17,11 +17,11 @@ endif
 " we base this syntax file on the modern superset, CWEB.  Note: This shortcut
 " may introduce some illegal constructs, e.g., CWEB's "@c" does _not_ start a
 " code section in WEB.  Anyway, I'm not a WEB programmer.
-runtime! syntax/cweb.vim
+runtime! syntax/cweb.mnv
 unlet b:current_syntax
 
 " Replace C/C++ syntax by Pascal syntax.
-syntax include @webIncludedC <sfile>:p:h/pascal.vim
+syntax include @webIncludedC <sfile>:p:h/pascal.mnv
 
 " Double-@ means single-@, anywhere in the WEB source (as in CWEB).
 " Don't misinterpret "@'" as the start of a Pascal string.
@@ -29,4 +29,4 @@ syntax match webIgnoredStuff "@[@']"
 
 let b:current_syntax = "web"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/webmacro.vim b/uvim/runtime/syntax/webmacro.mnv
index 95975251af..45e37ffdc5 100644
--- a/uvim/runtime/syntax/webmacro.vim
+++ b/uvim/runtime/syntax/webmacro.mnv
@@ -1,7 +1,7 @@
 " WebMacro syntax file
 " Language:     WebMacro
 " Maintainer:   Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/webmacro.vim
+" URL:		http://www.fleiner.com/mnv/syntax/webmacro.mnv
 " Last Change:  2003 May 11
 
 " webmacro is a nice little language that you should
@@ -19,7 +19,7 @@ if !exists("main_syntax")
 endif
 
 
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 syn cluster htmlPreProc add=webmacroIf,webmacroUse,webmacroBraces,webmacroParse,webmacroInclude,webmacroSet,webmacroForeach,webmacroComment
diff --git a/uvim/runtime/syntax/wget.vim b/uvim/runtime/syntax/wget.mnv
index 8d642b1411..d7533d858e 100644
--- a/uvim/runtime/syntax/wget.vim
+++ b/uvim/runtime/syntax/wget.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Wget configuration file (/etc/wgetrc ~/.wgetrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2026 Jan 07
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match wgetComment "#.*" contains=wgetTodo contained
 
@@ -238,4 +238,4 @@ let b:current_syntax = "wget"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker:
+" mnv: ts=8 fdm=marker:
diff --git a/uvim/runtime/syntax/wget2.vim b/uvim/runtime/syntax/wget2.mnv
index f256d53e6a..518778dcb0 100644
--- a/uvim/runtime/syntax/wget2.vim
+++ b/uvim/runtime/syntax/wget2.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2026 Jan 07
@@ -10,7 +10,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn match wget2Comment "#.*" contains=wget2Todo contained
 
@@ -248,4 +248,4 @@ let b:current_syntax = "wget2"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker:
+" mnv: ts=8 fdm=marker:
diff --git a/uvim/runtime/syntax/whitespace.vim b/uvim/runtime/syntax/whitespace.mnv
index 4d2e32eb71..4d2e32eb71 100644
--- a/uvim/runtime/syntax/whitespace.vim
+++ b/uvim/runtime/syntax/whitespace.mnv
diff --git a/uvim/runtime/syntax/winbatch.vim b/uvim/runtime/syntax/winbatch.mnv
index 15ea0fc77b..60cb1bc1c5 100644
--- a/uvim/runtime/syntax/winbatch.vim
+++ b/uvim/runtime/syntax/winbatch.mnv
@@ -1,7 +1,7 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	WinBatch/Webbatch (*.wbt, *.web)
 " Maintainer:	dominique@mggen.com
-" URL:		http://www.mggen.com/vim/syntax/winbatch.zip
+" URL:		http://www.mggen.com/mnv/syntax/winbatch.zip
 " Last change:	2001 May 10
 
 " quit when a syntax file was already loaded
@@ -171,4 +171,4 @@ hi def link winbatchConstant	StorageClass
 
 let b:current_syntax = "winbatch"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/wks.vim b/uvim/runtime/syntax/wks.mnv
index 1d242ada12..e29eb27ec9 100644
--- a/uvim/runtime/syntax/wks.vim
+++ b/uvim/runtime/syntax/wks.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	OpenEmbedded Image Creator (WIC) Kickstarter files wks
 " Maintainer:	Anakin Childerhose <anakin@childerhose.ca>
 " Last Change:	2026 Mar 23
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/wml.vim b/uvim/runtime/syntax/wml.mnv
index 73bf822e40..fcd9a89aaa 100644
--- a/uvim/runtime/syntax/wml.vim
+++ b/uvim/runtime/syntax/wml.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     WML - Website MetaLanguage
 " Maintainer:   Gerfried Fuchs <alfie@ist.org>
 " Filenames:    *.wml
 " Last Change:  07 Feb 2002
-" URL:		http://alfie.ist.org/software/vim/syntax/wml.vim
+" URL:		http://alfie.ist.org/software/mnv/syntax/wml.mnv
 "
 " Original Version: Craig Small <csmall@eye-net.com.au>
 
@@ -12,8 +12,8 @@
 " SPAM is _NOT_ welcome - be ready to be reported!
 
 "  If you are looking for the "Wireless Markup Language" syntax file,
-"  please take a look at the wap.vim file done by Ralf Schandl, soon in a
-"  vim-package around your corner :)
+"  please take a look at the wap.mnv file done by Ralf Schandl, soon in a
+"  mnv-package around your corner :)
 
 
 " quit when a syntax file was already loaded
@@ -23,7 +23,7 @@ endif
 
 
 " A lot of the web stuff looks like HTML so we load that first
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 unlet b:current_syntax
 
 if !exists("main_syntax")
@@ -101,7 +101,7 @@ syn region  htmlTagName    start="\<\(define-tag\|define-region\)" end="\>" cont
 " The perl include stuff
 if main_syntax != 'perl'
   " Perl script
-  syn include @wmlPerlScript syntax/perl.vim
+  syn include @wmlPerlScript syntax/perl.mnv
   unlet b:current_syntax
 
   syn region perlScript   start=+<perl>+ keepend end=+</perl>+ contains=@wmlPerlScript,wmlPerlTag
diff --git a/uvim/runtime/syntax/wsh.vim b/uvim/runtime/syntax/wsh.mnv
index 4b664a177e..815859a01f 100644
--- a/uvim/runtime/syntax/wsh.vim
+++ b/uvim/runtime/syntax/wsh.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Windows Scripting Host
 " Maintainer:	Paul Moore <pf_moore AT yahoo.co.uk>
 " Last Change:	Fre, 24 Nov 2000 21:54:09 +0100
@@ -14,15 +14,15 @@ if exists("b:current_syntax")
 endif
 
 let s:wsh_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-runtime! syntax/xml.vim
+runtime! syntax/xml.mnv
 unlet b:current_syntax
 
 syn case ignore
-syn include @wshVBScript <sfile>:p:h/vb.vim
+syn include @wshVBScript <sfile>:p:h/vb.mnv
 unlet b:current_syntax
-syn include @wshJavaScript <sfile>:p:h/javascript.vim
+syn include @wshJavaScript <sfile>:p:h/javascript.mnv
 unlet b:current_syntax
 syn region wshVBScript
     \ matchgroup=xmlTag    start="<script[^>]*VBScript\(>\|[^>]*[^/>]>\)"
diff --git a/uvim/runtime/syntax/wsml.vim b/uvim/runtime/syntax/wsml.mnv
index d01294caac..64e49dbca6 100644
--- a/uvim/runtime/syntax/wsml.vim
+++ b/uvim/runtime/syntax/wsml.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     WSML
 " Maintainer:   Thomas Haselwanter <thomas.haselwanter@deri.org>
 " URL:		none
diff --git a/uvim/runtime/syntax/wvdial.vim b/uvim/runtime/syntax/wvdial.mnv
index 035138b655..f73cf78f7e 100644
--- a/uvim/runtime/syntax/wvdial.vim
+++ b/uvim/runtime/syntax/wvdial.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:     Configuration file for WvDial
 " Maintainer:   Prahlad Vaidyanathan <slime@vsnl.net>
 " Last Update:  Mon, 15 Oct 2001 09:39:03 Indian Standard Time
@@ -25,4 +25,4 @@ hi def link wvdialEqual     Statement
 
 let b:current_syntax = "wvdial"
 
-"EOF vim: tw=78:ft=vim:ts=8
+"EOF mnv: tw=78:ft=mnv:ts=8
diff --git a/uvim/runtime/syntax/xbl.vim b/uvim/runtime/syntax/xbl.mnv
index 97837e38ec..582570bdcc 100644
--- a/uvim/runtime/syntax/xbl.vim
+++ b/uvim/runtime/syntax/xbl.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	    XBL 1.0
 " Maintainer:	    Doug Kearns <dougkearns@gmail.com>
 " Latest Revision:  2007 November 5
@@ -8,12 +8,12 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
-runtime! syntax/xml.vim
+runtime! syntax/xml.mnv
 unlet b:current_syntax
 
-syn include @javascriptTop syntax/javascript.vim
+syn include @javascriptTop syntax/javascript.mnv
 unlet b:current_syntax
 
 syn region xblJavascript
@@ -26,4 +26,4 @@ let b:current_syntax = "xbl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/xcompose.vim b/uvim/runtime/syntax/xcompose.mnv
index 3637b9f3b6..89c37c24b9 100644
--- a/uvim/runtime/syntax/xcompose.vim
+++ b/uvim/runtime/syntax/xcompose.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	XCompose
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	.XCompose, Compose
diff --git a/uvim/runtime/syntax/xdefaults.vim b/uvim/runtime/syntax/xdefaults.mnv
index 7da5969cde..4f15e2835a 100644
--- a/uvim/runtime/syntax/xdefaults.vim
+++ b/uvim/runtime/syntax/xdefaults.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	X resources files like ~/.Xdefaults (xrdb)
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 "		Author and previous maintainer:
 "		Gautam H. Mudunuri <gmudunur@informatica.com>
 " Last Change:	Di, 09 Mai 2006 23:10:23 CEST
-" $Id: xdefaults.vim,v 1.2 2007/05/05 17:19:40 vimboss Exp $
+" $Id: xdefaults.mnv,v 1.2 2007/05/05 17:19:40 mnvboss Exp $
 "
 " REFERENCES:
 "   xrdb manual page
@@ -129,4 +129,4 @@ hi def link xdefaultsTodo		Todo
 
 let b:current_syntax = "xdefaults"
 
-" vim:ts=8
+" mnv:ts=8
diff --git a/uvim/runtime/syntax/xf86conf.vim b/uvim/runtime/syntax/xf86conf.mnv
index 0f4e5036ff..98e707be24 100644
--- a/uvim/runtime/syntax/xf86conf.vim
+++ b/uvim/runtime/syntax/xf86conf.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language: XF86Config (XFree86 configuration file)
 " Maintainer: This runtime file is looking for a new maintainer.
 " Last Change: 2025 Jan 06 by Jan-Arvid Harrach (#16397)
diff --git a/uvim/runtime/syntax/xhtml.vim b/uvim/runtime/syntax/xhtml.mnv
index 0c6ea73403..76e1bb9872 100644
--- a/uvim/runtime/syntax/xhtml.vim
+++ b/uvim/runtime/syntax/xhtml.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	XHTML
 " Maintainer:	noone
 " Last Change:	2003 Feb 04
 
 " Load the HTML syntax for now.
-runtime! syntax/html.vim
+runtime! syntax/html.mnv
 
 let b:current_syntax = "xhtml"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/xinetd.vim b/uvim/runtime/syntax/xinetd.mnv
index fab3a916ea..19a038c871 100644
--- a/uvim/runtime/syntax/xinetd.vim
+++ b/uvim/runtime/syntax/xinetd.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             xinetd.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword xinetdTodo          contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/xkb.vim b/uvim/runtime/syntax/xkb.mnv
index 22be56d725..e41faf82f5 100644
--- a/uvim/runtime/syntax/xkb.vim
+++ b/uvim/runtime/syntax/xkb.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: XKB (X Keyboard Extension) components
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Last Change: 2020 Oct 18
-" URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim
+" URL: http://trific.ath.cx/Ftp/mnv/syntax/xkb.mnv
 
 " Setup
 " quit when a syntax file was already loaded
diff --git a/uvim/runtime/syntax/xmath.vim b/uvim/runtime/syntax/xmath.mnv
index 466c1159c7..b3490c4d8e 100644
--- a/uvim/runtime/syntax/xmath.vim
+++ b/uvim/runtime/syntax/xmath.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	xmath (a simulation tool)
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Aug 31, 2016
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Version:	10
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_XMATH
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -224,4 +224,4 @@ endif
 
 let b:current_syntax = "xmath"
 
-" vim: ts=17
+" mnv: ts=17
diff --git a/uvim/runtime/syntax/xml.vim b/uvim/runtime/syntax/xml.mnv
index d99f8b467a..831885603c 100644
--- a/uvim/runtime/syntax/xml.vim
+++ b/uvim/runtime/syntax/xml.mnv
@@ -1,14 +1,14 @@
-" Vim syntax file
+" MNV syntax file
 " Language: XML
 " Maintainer: Christian Brabandt <cb@256bit.org>
-" Repository: https://github.com/chrisbra/vim-xml-ftplugin
+" Repository: https://github.com/chrisbra/mnv-xml-ftplugin
 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
 " Author: Paul Siegmann <pauls@euronet.nl>
 " Last Changed:	Nov 03, 2019
 " Filenames:	*.xml
 " Last Change:
-" 20190923 - Fix xmlEndTag to match xmlTag (vim/vim#884)
-" 20190924 - Fix xmlAttribute property (amadeus/vim-xml@d8ce1c946)
+" 20190923 - Fix xmlEndTag to match xmlTag (mnv/mnv#884)
+" 20190924 - Fix xmlAttribute property (amadeus/mnv-xml@d8ce1c946)
 " 20191103 - Enable spell checking globally
 " 20210428 - Improve syntax synchronizing
 
@@ -17,13 +17,13 @@
 "
 "      let g:xml_syntax_folding = 1
 "
-"   before the syntax file gets loaded (e.g. in ~/.vimrc).
+"   before the syntax file gets loaded (e.g. in ~/.mnvrc).
 "   This might slow down syntax highlighting significantly,
 "   especially for large files.
 "
 " CREDITS:
 "   The original version was derived by Paul Siegmann from
-"   Claudio Fleiner's html.vim.
+"   Claudio Fleiner's html.mnv.
 "
 " REFERENCES:
 "   [1] http://www.w3.org/TR/2000/REC-xml-20001006
@@ -50,7 +50,7 @@ if exists("b:current_syntax")
 endif
 
 let s:xml_cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
@@ -280,7 +280,7 @@ syn region  xmlProcessing matchgroup=xmlProcessingDelim start="<?" end="?>" cont
 
 if exists('g:xml_syntax_folding')
 
-    " DTD -- we use dtd.vim here
+    " DTD -- we use dtd.mnv here
     syn region  xmlDocType matchgroup=xmlDocTypeDecl
 	\ start="<!DOCTYPE"he=s+2,rs=s+2 end=">"
 	\ fold
@@ -298,7 +298,7 @@ endif
 
 syn keyword xmlDocTypeKeyword contained DOCTYPE PUBLIC SYSTEM
 syn region  xmlInlineDTD contained matchgroup=xmlDocTypeDecl start="\[" end="]" contains=@xmlDTD
-syn include @xmlDTD <sfile>:p:h/dtd.vim
+syn include @xmlDTD <sfile>:p:h/dtd.mnv
 unlet b:current_syntax
 
 
@@ -358,4 +358,4 @@ let b:current_syntax = "xml"
 let &cpo = s:xml_cpo_save
 unlet s:xml_cpo_save
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/xmodmap.vim b/uvim/runtime/syntax/xmodmap.mnv
index 28cae3eb71..fd3fd3b30a 100644
--- a/uvim/runtime/syntax/xmodmap.vim
+++ b/uvim/runtime/syntax/xmodmap.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             xmodmap(1) definition file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn keyword xmodmapTodo       contained TODO FIXME XXX NOTE
 
diff --git a/uvim/runtime/syntax/xpm.vim b/uvim/runtime/syntax/xpm.mnv
index 0cfdbe5aa0..aa6e6ff706 100644
--- a/uvim/runtime/syntax/xpm.vim
+++ b/uvim/runtime/syntax/xpm.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
 " Last Change:	2023 May 24
@@ -89,7 +89,7 @@ def s:CreateSyntax(): void
 	       endif
 	    endif
 
-	    # Vim cannot handle RGB codes with more than 6 hex digits
+	    # MNV cannot handle RGB codes with more than 6 hex digits
 	    if color =~ '#\x\{10,}$'
 	       color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
 	    elseif color =~ '#\x\{7,}$'
@@ -151,4 +151,4 @@ hi def link xpmPixelString	String
 
 let b:current_syntax = "xpm"
 
-" vim: ts=8:sw=3:noet:
+" mnv: ts=8:sw=3:noet:
diff --git a/uvim/runtime/syntax/xpm2.vim b/uvim/runtime/syntax/xpm2.mnv
index dfa6945a31..ae06c31354 100644
--- a/uvim/runtime/syntax/xpm2.vim
+++ b/uvim/runtime/syntax/xpm2.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	X Pixmap v2
 " Maintainer:	Steve Wall (hitched97@velnet.com)
 " Last Change:	2017 Feb 01
@@ -6,7 +6,7 @@
 " Version:	5.8
 "               Jemma Nelson added termguicolors support
 "
-" Made from xpm.vim by Ronald Schild <rs@scutum.de>
+" Made from xpm.mnv by Ronald Schild <rs@scutum.de>
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 syn region  xpm2PixelString	start="^"  end="$"  contains=@xpm2Colors
 syn keyword xpm2Todo		TODO FIXME XXX  contained
@@ -83,7 +83,7 @@ if has("gui_running") || has("termguicolors") && &termguicolors
 	  endif
 	endif
 
-	" Vim cannot handle RGB codes with more than 6 hex digits
+	" MNV cannot handle RGB codes with more than 6 hex digits
 	if color =~ '#\x\{10,}$'
 	  let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
 	elseif color =~ '#\x\{7,}$'
@@ -150,4 +150,4 @@ let b:current_syntax = "xpm2"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8:sw=2:noet:
+" mnv: ts=8:sw=2:noet:
diff --git a/uvim/runtime/syntax/xquery.vim b/uvim/runtime/syntax/xquery.mnv
index 0c6b72a407..b3408399c4 100644
--- a/uvim/runtime/syntax/xquery.vim
+++ b/uvim/runtime/syntax/xquery.mnv
@@ -1,11 +1,11 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	XQuery
 " Author: René Neumann <necoro@necoro.eu>
 " Author: Steve Spigarelli <http://spig.net/>
 " Original Author:	Jean-Marc Vanel <http://jmvanel.free.fr/>
 " Last Change:	mar jui 12 18:04:05 CEST 2005
 " Filenames:	*.xq
-" URL:		http://jmvanel.free.fr/vim/xquery.vim
+" URL:		http://jmvanel.free.fr/mnv/xquery.mnv
 
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xquery/
@@ -18,14 +18,14 @@ endif
 " - is allowed in keywords
 setlocal iskeyword+=-
 
-runtime syntax/xml.vim
+runtime syntax/xml.mnv
 
 syn case match
 
 " From XQuery grammar:
 syn keyword xqStatement ancestor ancestor-or-self and as ascending at attribute base-uri boundary-space by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes
 
-" TODO contains clashes with vim keyword
+" TODO contains clashes with mnv keyword
 syn	keyword	xqFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one
 
 syn keyword xqOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than
diff --git a/uvim/runtime/syntax/xs.vim b/uvim/runtime/syntax/xs.mnv
index 90f8d3710a..f6e5eebf97 100644
--- a/uvim/runtime/syntax/xs.vim
+++ b/uvim/runtime/syntax/xs.mnv
@@ -1,18 +1,18 @@
-" Vim syntax file
+" MNV syntax file
 " Language:      XS (Perl extension interface language)
 " Author:        Autogenerated from perl headers, on an original basis of Michael W. Dodge <sarge@pobox.com>
-" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
+" Maintainer:    mnv-perl <mnv-perl@googlegroups.com> (need to be subscribed to post)
 " Previous:      Vincent Pit <perl@profvince.com>
-" Homepage:      https://github.com/vim-perl/vim-perl
-" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
-" License:       Vim License (see :help license)
+" Homepage:      https://github.com/mnv-perl/mnv-perl
+" Bugs/requests: https://github.com/mnv-perl/mnv-perl/issues
+" License:       MNV License (see :help license)
 " Last Change:   2018 Mar 28
 
 if exists("b:current_syntax")
   finish
 endif
 
-runtime! syntax/c.vim
+runtime! syntax/c.mnv
 
 " Configuration:
 " let xs_superseded = 0 " mark C functions superseded by Perl replacements (ex. memcpy vs Copy)
@@ -3677,4 +3677,4 @@ hi def link xsMacro      Macro
 
 let b:current_syntax = "xs"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/xsd.vim b/uvim/runtime/syntax/xsd.mnv
index 5ba6b4499a..cf3afa4c33 100644
--- a/uvim/runtime/syntax/xsd.vim
+++ b/uvim/runtime/syntax/xsd.mnv
@@ -1,9 +1,9 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	XSD (XML Schema)
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Tue, 27 Apr 2004 14:54:59 CEST
 " Filenames:	*.xsd
-" $Id: xsd.vim,v 1.1 2004/06/13 18:20:48 vimboss Exp $
+" $Id: xsd.mnv,v 1.1 2004/06/13 18:20:48 mnvboss Exp $
 
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xmlschema-0
@@ -14,7 +14,7 @@ if exists("b:current_syntax")
     finish
 endif
 
-runtime syntax/xml.vim
+runtime syntax/xml.mnv
 
 syn cluster xmlTagHook add=xsdElement
 syn case match
@@ -58,4 +58,4 @@ syn match xsdElement '\%(xsd:\)\@<=unique'
 
 hi def link xsdElement Statement
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/xslt.vim b/uvim/runtime/syntax/xslt.mnv
index 900b8ca049..ac58beadab 100644
--- a/uvim/runtime/syntax/xslt.vim
+++ b/uvim/runtime/syntax/xslt.mnv
@@ -1,10 +1,10 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	XSLT
 " Maintainer:   Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
 " Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Fri, 17 Jan 2020 07:15:37 +0200
 " Filenames:	*.xsl
-" $Id: xslt.vim,v 1.1 2004/06/13 15:52:10 vimboss Exp $
+" $Id: xslt.mnv,v 1.1 2004/06/13 15:52:10 mnvboss Exp $
 
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xslt
@@ -15,7 +15,7 @@ if exists("b:current_syntax")
     finish
 endif
 
-runtime syntax/xml.vim
+runtime syntax/xml.mnv
 
 syn cluster xmlTagHook add=xslElement
 syn case match
@@ -68,4 +68,4 @@ syn match xslElement '\%(xsl:\)\@<=with-param'
 
 hi def link xslElement Statement
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/xxd.vim b/uvim/runtime/syntax/xxd.mnv
index 1c06b4296f..88fae85ebc 100644
--- a/uvim/runtime/syntax/xxd.vim
+++ b/uvim/runtime/syntax/xxd.mnv
@@ -1,12 +1,12 @@
-" Vim syntax file
+" MNV syntax file
 " Language:		bin using xxd
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:	Charles E. Campbell
 " Last Change:	Aug 31, 2016
 " Version:		11
-"   2024 Feb 19 by Vim Project (announce adoption)
+"   2024 Feb 19 by MNV Project (announce adoption)
 " Notes:		use :help xxd   to see how to invoke it
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XXD
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_XXD
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -29,4 +29,4 @@ endif
 
 let b:current_syntax = "xxd"
 
-" vim: ts=4
+" mnv: ts=4
diff --git a/uvim/runtime/syntax/yacc.vim b/uvim/runtime/syntax/yacc.mnv
index 8100489422..ddfd4266ac 100644
--- a/uvim/runtime/syntax/yacc.vim
+++ b/uvim/runtime/syntax/yacc.mnv
@@ -1,16 +1,16 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Yacc
 " Former Maintainer: Charles E. Campbell
 " Last Change:	Mar 25, 2019
 " Version:	17
-"   2024 Feb 19 by Vim Project (announce adoption)
-" Former URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_YACC
+"   2024 Feb 19 by MNV Project (announce adoption)
+" Former URL:	http://www.drchip.org/astronaut/mnv/index.html#SYNTAX_YACC
 "
 " Options: {{{1
 "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
 
 " ---------------------------------------------------------------------
-" this version of syntax/yacc.vim requires 6.0 or later
+" this version of syntax/yacc.mnv requires 6.0 or later
 if exists("b:current_syntax")
  syntax clear
 endif
@@ -26,9 +26,9 @@ endif
 " ---------------------------------------------------------------------
 " Read the C syntax to start with {{{1
 " Read the C/C++ syntax to start with
-let s:Cpath= fnameescape(expand("<sfile>:p:h").(exists("g:yacc_uses_cpp")? "/cpp.vim" : "/c.vim"))
+let s:Cpath= fnameescape(expand("<sfile>:p:h").(exists("g:yacc_uses_cpp")? "/cpp.mnv" : "/c.mnv"))
 if !filereadable(s:Cpath)
- for s:Cpath in split(globpath(&rtp,(exists("g:yacc_uses_cpp")? "syntax/cpp.vim" : "syntax/c.vim")),"\n")
+ for s:Cpath in split(globpath(&rtp,(exists("g:yacc_uses_cpp")? "syntax/cpp.mnv" : "syntax/c.mnv")),"\n")
   if filereadable(fnameescape(s:Cpath))
    let s:Cpath= fnameescape(s:Cpath)
    break
@@ -118,4 +118,4 @@ let b:current_syntax = "yacc"
 
 " ---------------------------------------------------------------------
 "  Modelines: {{{1
-" vim: ts=15 fdm=marker
+" mnv: ts=15 fdm=marker
diff --git a/uvim/runtime/syntax/yaml.vim b/uvim/runtime/syntax/yaml.mnv
index e992bc02e6..0961aa8776 100644
--- a/uvim/runtime/syntax/yaml.vim
+++ b/uvim/runtime/syntax/yaml.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:         YAML (YAML Ain't Markup Language) 1.2
-" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" Maintainer:       Nikolai Pavlov <zyx.mnv@gmail.com>
 " First author:     Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2024-04-01
 
@@ -9,7 +9,7 @@ if exists('b:current_syntax')
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 " Choose the schema to use
 " TODO: Validate schema
@@ -272,4 +272,4 @@ delfunction s:SimplifyToAssumeAllPrintable
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: set et sw=4 sts=4 ts=8:
+" mnv: set et sw=4 sts=4 ts=8:
diff --git a/uvim/runtime/syntax/z8a.vim b/uvim/runtime/syntax/z8a.mnv
index 6809eb98cd..b9a2c7556d 100644
--- a/uvim/runtime/syntax/z8a.vim
+++ b/uvim/runtime/syntax/z8a.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Z80 assembler asz80
 " Maintainer:	Milan Pikula <www@fornax.elf.stuba.sk>
 " Last Change:	2003 May 11
@@ -98,4 +98,4 @@ hi def link z8aString		String
 
 
 let b:current_syntax = "z8a"
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/zathurarc.vim b/uvim/runtime/syntax/zathurarc.mnv
index 32997c2d2d..342dc07100 100644
--- a/uvim/runtime/syntax/zathurarc.vim
+++ b/uvim/runtime/syntax/zathurarc.mnv
@@ -1,8 +1,8 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Zathurarc
 " Maintainer:           Wu, Zhenyu <wuzhenyu@ustc.edu>
 " Documentation:        https://pwmt.org/projects/zathura/documentation/
-" Upstream:             https://github.com/Freed-Wu/zathurarc.vim
+" Upstream:             https://github.com/Freed-Wu/zathurarc.mnv
 " Latest Revision:      2024-09-16
 
 if exists('b:current_syntax')
@@ -29,7 +29,7 @@ highlight default link zathurarcNumber Number
 highlight default link zathurarcMode Macro
 highlight default link zathurarcString String
 highlight default link zathurarcBoolean Boolean
-" same as vim
+" same as mnv
 highlight default link zathurarcBracket Delimiter
 highlight default link zathurarcNotation Special
 highlight default link zathurarcCommand Statement
diff --git a/uvim/runtime/syntax/zig.vim b/uvim/runtime/syntax/zig.mnv
index 121b0195b0..51edfd926b 100644
--- a/uvim/runtime/syntax/zig.vim
+++ b/uvim/runtime/syntax/zig.mnv
@@ -1,13 +1,13 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Zig
-" Upstream: https://github.com/ziglang/zig.vim
+" Upstream: https://github.com/ziglang/zig.mnv
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 let s:zig_syntax_keywords = {
     \   'zigBoolean': ["true"
diff --git a/uvim/runtime/syntax/zimbu.vim b/uvim/runtime/syntax/zimbu.mnv
index 472559520e..60adcad163 100644
--- a/uvim/runtime/syntax/zimbu.vim
+++ b/uvim/runtime/syntax/zimbu.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Zimbu
-" Maintainer:	The·Vim·Project·<https://github.com/vim/vim>
+" Maintainer:	The·MNV·Project·<https://github.com/Project-Tick/Project-Tick>
 " Last Change:	2023 Aug 13
 " Note: 	Zimbu seems to be dead :(
 
@@ -8,7 +8,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-syn include @Ccode syntax/c.vim
+syn include @Ccode syntax/c.mnv
 
 syn keyword zimbuTodo		TODO FIXME XXX contained
 syn match   zimbuNoBar          "|" contained
@@ -158,4 +158,4 @@ hi def link zimbuError		Error
 
 let b:current_syntax = "zimbu"
 
-" vim: ts=8
+" mnv: ts=8
diff --git a/uvim/runtime/syntax/zir.vim b/uvim/runtime/syntax/zir.mnv
index 6553d322b7..fec6c953f4 100644
--- a/uvim/runtime/syntax/zir.vim
+++ b/uvim/runtime/syntax/zir.mnv
@@ -1,6 +1,6 @@
-" Vim syntax file
+" MNV syntax file
 " Language: Zir
-" Upstream: https://github.com/ziglang/zig.vim
+" Upstream: https://github.com/ziglang/zig.mnv
 
 if exists("b:current_syntax")
   finish
diff --git a/uvim/runtime/syntax/zserio.vim b/uvim/runtime/syntax/zserio.mnv
index 5459915c01..007580b9d3 100644
--- a/uvim/runtime/syntax/zserio.vim
+++ b/uvim/runtime/syntax/zserio.mnv
@@ -1,4 +1,4 @@
-" Vim syntax file
+" MNV syntax file
 " Language:	Zserio
 " Maintainer:	Dominique Pellé <dominique.pelle@gmail.com>
 " Last Change:	2023 Jun 18
@@ -21,7 +21,7 @@ if exists("b:current_syntax")
 endif
 
 let s:keepcpo= &cpo
-set cpo&vim
+set cpo&mnv
 
 syn case match
 
diff --git a/uvim/runtime/syntax/zsh.vim b/uvim/runtime/syntax/zsh.mnv
index 3bd0b87b75..6b12b6ad1f 100644
--- a/uvim/runtime/syntax/zsh.vim
+++ b/uvim/runtime/syntax/zsh.mnv
@@ -1,22 +1,22 @@
-" Vim syntax file
+" MNV syntax file
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2025 Feb 18
-" License:              Vim (see :h license)
-" Repository:           https://github.com/chrisbra/vim-zsh
+" License:              MNV (see :h license)
+" Repository:           https://github.com/chrisbra/mnv-zsh
 
 if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 function! s:ContainedGroup()
   " needs 7.4.2008 for execute() function
   let result='TOP'
-    " vim-pandoc syntax defines the @langname cluster for embedded syntax languages
+    " mnv-pandoc syntax defines the @langname cluster for embedded syntax languages
     " However, if no syntax is defined yet, `syn list @zsh` will return
     " "No syntax items defined", so make sure the result is actually a valid syn cluster
     for cluster in ['markdownHighlight_zsh', 'zsh']
@@ -290,7 +290,7 @@ syn region  zshMathSubst        matchgroup=zshSubstDelim transparent
                                 \ contains=zshParentheses,@zshSubst,zshNumber,
                                 \ @zshDerefs,zshString fold
 " The ms=s+1 prevents matching zshBrackets several times on opening brackets
-" (see https://github.com/chrisbra/vim-zsh/issues/21#issuecomment-576330348)
+" (see https://github.com/chrisbra/mnv-zsh/issues/21#issuecomment-576330348)
 syn region  zshBrackets         contained transparent start='{'ms=s+1 skip='\\}'
                                 \ end='}' fold
 exe 'syn region  zshBrackets    transparent start=/{/ms=s+1 skip=/\\}/ end=/}/ contains='.s:contained. ' fold'