diff --git a/article.jats_publishing b/article.jats_publishing
index 68032992..ebd14e9d 100644
--- a/article.jats_publishing
+++ b/article.jats_publishing
@@ -89,14 +89,20 @@ $endif$
 $if(author)$
 <contrib-group>
 $for(author)$
-<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="yes"$endif$>
+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="yes"$endif$$if(author.cor-id)$ corresp="yes"$endif$>
 $if(author.orcid)$
 <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
 $endif$
 $if(author.surname)$
 <name>
-<surname>$author.surname$</surname>
-<given-names>$author.given-names$</given-names>
+<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$$author.surname$</surname>
+<given-names>$author.given-names$$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
+$if(author.prefix)$
+<prefix>${author.suffix}</prefix>
+$endif$
+$if(author.suffix)$
+<suffix>${author.suffix}</suffix>
+$endif$
 </name>
 $elseif(author.name)$
 <string-name>$author.name$</string-name>
@@ -172,7 +178,6 @@ $if(history)$
 <history>
 </history>
 $endif$
-$if(copyright)$
 <permissions>
 $for(copyright.statement)$
 <copyright-statement>$copyright.statement$</copyright-statement>
@@ -189,12 +194,14 @@ $if(copyright.text)$
 </license>
 $endif$
 $for(license)$
-<license$if(it.type)$ license-type="${it.type}"$endif$$if(it.link)$ xlink:href="${it.link}"$endif$>
+<license$if(it.type)$ license-type="${it.type}"$endif$>
+$if(it.link)$
+<ali:license_ref xmlns:ali="http://www.niso.org/schemas/ali/1.0/">${it.link}</ali:license_ref>
+$endif$
 <license-p>$if(it.text)$${it.text}$else$${it}$endif$</license-p>
 </license>
 $endfor$
 </permissions>
-$endif$
 $if(abstract)$
 <abstract>
 $abstract$
diff --git a/default.context b/default.context
index 49b2c1f6..c7aca89c 100644
--- a/default.context
+++ b/default.context
@@ -80,6 +80,10 @@ $endif$
 \setuphead[subsubsubsection]   [style=\sc]
 \setuphead[subsubsubsubsection][style=\it]
 
+\definesectionlevels
+   [default]
+   [section, subsection, subsubsection, subsubsubsection, subsubsubsubsection]
+
 $if(headertext)$
 \setupheadertexts$for(headertext)$[$headertext$]$endfor$
 $endif$
@@ -105,9 +109,10 @@ $endif$
 \setupfloat[table][default={here,nonumber}]
 
 \setupxtable[frame=off]
-\setupxtable[head][topframe=on,bottomframe=on]
+\setupxtable[head][topframe=on]
 \setupxtable[body][]
-\setupxtable[foot][bottomframe=on]
+\setupxtable[foot][]
+\setupxtable[lastrow][bottomframe=on]
 
 $if(csl-refs)$
 \definemeasure[cslhangindent][1.5em]
diff --git a/default.jats_articleauthoring b/default.jats_articleauthoring
index 2c0de277..3f62027d 100644
--- a/default.jats_articleauthoring
+++ b/default.jats_articleauthoring
@@ -22,14 +22,20 @@ $endif$
 $if(author)$
 <contrib-group>
 $for(author)$
-<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="yes"$endif$>
+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="yes"$endif$$if(author.cor-id)$ corresp="yes"$endif$>
 $if(author.orcid)$
 <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
 $endif$
 $if(author.surname)$
 <name>
-<surname>$author.surname$</surname>
-<given-names>$author.given-names$</given-names>
+<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$${author.surname}</surname>
+<given-names>${author.given-names}$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
+$if(author.prefix)$
+<prefix>${author.suffix}</prefix>
+$endif$
+$if(author.suffix)$
+<suffix>${author.suffix}</suffix>
+$endif$
 </name>
 $elseif(author.name)$
 <string-name>$author.name$</string-name>
@@ -49,7 +55,6 @@ $endif$
 $endfor$
 </contrib-group>
 $endif$
-$if(copyright)$
 <permissions>
 $for(copyright.statement)$
 <copyright-statement>$copyright.statement$</copyright-statement>
@@ -71,7 +76,6 @@ $for(license)$
 </license>
 $endfor$
 </permissions>
-$endif$
 <abstract>
 $abstract$
 </abstract>
diff --git a/default.latex b/default.latex
index 7d539fe0..638eacab 100644
--- a/default.latex
+++ b/default.latex
@@ -154,7 +154,7 @@ $if(zero-width-non-joiner)$
 \def\zerowidthnonjoiner{%
   % Prevent ligatures and adjust kerning, but still support hyphenating.
   \texorpdfstring{%
-    \textormath{\nobreak\discretionary{-}{}{\kern.03em}%
+    \TextOrMath{\nobreak\discretionary{-}{}{\kern.03em}%
       \ifvmode\else\nobreak\hskip\z@skip\fi}{}%
   }{}%
 }
@@ -270,10 +270,6 @@ $if(graphics)$
 \def\fps@figure{htbp}
 \makeatother
 $endif$
-$if(links-as-notes)$
-% Make links footnotes instead of hotlinks:
-\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}}
-$endif$
 $if(strikeout)$
 $-- also used for underline
 \usepackage[normalem]{ulem}
@@ -378,6 +374,10 @@ $endif$
 \IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}}
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \urlstyle{same} % disable monospaced font for URLs
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
 $if(verbatim-in-note)$
 \VerbatimFootnotes % allow verbatim text in footnotes
 $endif$
@@ -403,6 +403,8 @@ $if(colorlinks)$
   filecolor={$if(filecolor)$$filecolor$$else$Maroon$endif$},
   citecolor={$if(citecolor)$$citecolor$$else$Blue$endif$},
   urlcolor={$if(urlcolor)$$urlcolor$$else$Blue$endif$},
+$endif$
+$if(boxlinks)$
 $else$
   hidelinks,
 $endif$
diff --git a/default.ms b/default.ms
index 96af30fb..27c4f9b7 100644
--- a/default.ms
+++ b/default.ms
@@ -1,3 +1,7 @@
+$if(pandoc-version)$
+.\" Automatically generated by Pandoc $pandoc-version$
+.\"
+$endif$
 .\" **** Custom macro definitions *********************************
 .\" * Super/subscript
 .\" (https://lists.gnu.org/archive/html/groff/2012-07/msg00046.html)
@@ -58,7 +62,7 @@ $endif$
 .als SN SN-NO-DOT
 .als SN-STYLE SN-NO-DOT
 .\" page numbers in footer, centered
-.rm CH
+.ds CH
 .ds CF %
 .\" pdf outline fold level
 .nr PDFOUTLINE.FOLDLEVEL 3
diff --git a/styles.html b/styles.html
index d63d0ac6..15f34bf5 100644
--- a/styles.html
+++ b/styles.html
@@ -163,10 +163,15 @@
 $endif$
 code{white-space: pre-wrap;}
 span.smallcaps{font-variant: small-caps;}
-span.underline{text-decoration: underline;}
-div.column{display: inline-block; vertical-align: top; width: 50%;}
+div.columns{display: flex; gap: min(4vw, 1.5em);}
+div.column{flex: 1;}
 div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
 ul.task-list{list-style: none;}
+ul.task-list li input[type="checkbox"] {
+  width: 0.8em;
+  margin: 0 0.8em 0.2em -1.6em;
+  vertical-align: middle;
+}
 $if(quotes)$
 q { quotes: "“" "”" "‘" "’"; }
 $endif$