diff --git a/makefile b/makefile
index 99532e8..be94e1d 100644
--- a/makefile
+++ b/makefile
@@ -31,7 +31,7 @@ index.orig.html: index.sh $(PRE) $(UML)
 	bash ./index.sh $(PRE) > $@
 
 index.html: index.orig.html
-	npx html-minifier-terser --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype \
+	pnpx html-minifier-terser --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype \
 	                         --minify-urls --minify-js true --minify-css true $< > $@
 
 %.pre.html %.syntax.css: %.uml
diff --git a/tohtml.sh b/tohtml.sh
index def73e4..6a73f81 100644
--- a/tohtml.sh
+++ b/tohtml.sh
@@ -17,16 +17,15 @@ fi
 
 toHtml="$VIM_TO_HTML"
 if ! [ -e "$toHtml" ]; then
-  toHtml="$HOME/install/share/vim/vim90/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="/usr/share/vim/vim90/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="$HOME/install/share/vim/vim82/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="/usr/share/vim/vim82/syntax/2html.vim"
+  for ver in 91 90 82 81; do
+    toHtml="$HOME/install/share/vim/vim$ver/syntax/2html.vim"
+    if ! [ -e "$toHtml" ]; then
+      toHtml="/usr/share/vim/vim$ver/syntax/2html.vim"
+    fi
+    if [ -e "$toHtml" ]; then
+      break
+    fi
+  done
 fi
 if ! [ -e "$toHtml" ]; then
   echo "Cannot find 2html.vim script, set VIM_TO_HTML variable"
diff --git a/vim/pack/test/opt/plantuml-syntax b/vim/pack/test/opt/plantuml-syntax
index 1592944..7edce07 160000
--- a/vim/pack/test/opt/plantuml-syntax
+++ b/vim/pack/test/opt/plantuml-syntax
@@ -1 +1 @@
-Subproject commit 1592944444513c208ab5a087397ba987932af750
+Subproject commit 7edce07dd7db083f0a2da9b4b054964eb5b68583