From b821116421f0d942052ad225f4ea62aef2696817 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Mon, 13 Jul 2020 17:21:34 +0200
Subject: 2020-07-13 16:31:00

---
 tex/context/interface/mkiv/context-en.xml | 3993 +++++++++++++++--------------
 1 file changed, 2119 insertions(+), 1874 deletions(-)

(limited to 'tex/context/interface/mkiv/context-en.xml')

diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index ff6203585..485ca4a9a 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -2,7 +2,7 @@
 <!-- expanded and compacted i-context.xml -->
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
  <cd:interface file="i-accent.xml">
-  <cd:command file="enco-ini.mkiv" level="style" name="defineaccent">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="defineaccent">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:character"/>
@@ -15,7 +15,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="definecharacter">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="definecharacter">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:character"/>
@@ -25,7 +25,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="definecommand">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="definecommand">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:character"/>
@@ -35,7 +35,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="definemathaccent">
+  <cd:command category="mathematics" file="enco-ini.mkiv" level="style" name="definemathaccent">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
@@ -45,7 +45,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildmathaccent">
+  <cd:command category="mathematics" file="enco-ini.mkiv" level="style" name="buildmathaccent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -55,7 +55,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextaccent">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextaccent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -65,49 +65,49 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextmacron">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextmacron">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomdot">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextbottomdot">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextcedilla">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextcedilla">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextognek">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextognek">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomcomma">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextbottomcomma">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="d">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="d">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="enco-ini.mkiv" level="style" name="buildtextgrave">
+  <cd:command category="language" file="enco-ini.mkiv" level="style" name="buildtextgrave">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -365,7 +365,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="wordright">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="linebreak" level="document" name="wordright">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="right"/>
@@ -374,7 +374,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedbox">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -391,7 +391,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedspreadbox">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedspreadbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -408,7 +408,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedboxplus">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes" level="system" name="simplealignedboxplus">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -428,7 +428,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedbox">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes direction" level="system" name="simplereversealignedbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -445,7 +445,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedboxplus">
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="boxes direction" level="system" name="simplereversealignedboxplus">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -465,7 +465,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="pack-box.mkiv" level="system" name="alignedbox">
+  <cd:command category="alignment" file="pack-box.mkiv" keywords="boxes" level="system" name="alignedbox">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="left"/>
@@ -506,8 +506,8 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="lefttoright"/>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="righttoleft"/>
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="direction" level="style" name="lefttoright"/>
+  <cd:command category="alignment" file="spac-ali.mkiv" keywords="direction" level="style" name="righttoleft"/>
   <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedbottom"/>
   <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="alignbottom"/>
   <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="baselinebottom"/>
@@ -582,7 +582,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-anchor.xml">
-  <cd:command file="pack-box.mkiv" level="style" name="defineanchor">
+  <cd:command category="graphics" file="pack-box.mkiv" level="style" name="defineanchor">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -599,7 +599,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-box.mkiv" level="document" name="anchor">
+  <cd:command category="graphics" file="pack-box.mkiv" level="document" name="anchor">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -616,7 +616,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-attachment.xml">
-  <cd:command file="scrn-wid.mkvi" level="style" name="defineattachment">
+  <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="defineattachment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -629,7 +629,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" level="style" name="setupattachment">
+  <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupattachment">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -704,7 +704,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" level="style" name="setupattachments">
+  <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupattachments">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -714,7 +714,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" level="document" name="registerattachment">
+  <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="registerattachment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -724,7 +724,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance">
+  <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance">
    <cd:sequence>
     <cd:instance value="attachment"/>
    </cd:sequence>
@@ -740,7 +740,7 @@
     <cd:constant value="attachment"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance">
+  <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="attachment"/>
    </cd:sequence>
@@ -756,7 +756,7 @@
     <cd:constant value="attachment"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="scrn-wid.mkvi" level="document" name="placeattachments"/>
+  <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="placeattachments"/>
  </cd:interface>
  <cd:interface file="i-attribute.xml">
   <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="pushattribute">
@@ -856,7 +856,7 @@
   <cd:command category="attribute" file="attr-ini.mkiv" level="document" name="showattributes"/>
  </cd:interface>
  <cd:interface file="i-backend.xml">
-  <cd:command catehory="pdf" file="back-ini.mkiv" level="style" name="setupbackend">
+  <cd:command category="pdf" file="back-ini.mkiv" level="style" name="setupbackend">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="export">
@@ -931,7 +931,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="back-ini.mkxl" name="setupoutput">
+  <cd:command category="pdf" file="back-ini.mkxl" level="style" name="setupoutput">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="default"/>
@@ -1028,7 +1028,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background colors" file="pack-bck.mkvi" level="document" name="backgroundline">
+  <cd:command category="background" file="pack-bck.mkvi" keywords="colors" level="document" name="backgroundline">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:color"/>
@@ -1083,7 +1083,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifelsesomebackground">
+  <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifelsesomebackground">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -1096,7 +1096,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackgroundelse">
+  <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifsomebackgroundelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -1109,7 +1109,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackground">
+  <cd:command category="background" file="page-bck.mkiv" keywords="conditional" level="system" name="doifsomebackground">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -1278,7 +1278,7 @@
   <cd:command category="rules" file="node-rul.mkiv" level="style" name="resetbar"/>
  </cd:interface>
  <cd:interface file="i-blackrule.xml">
-  <cd:command category="rules colors" file="pack-mrl.mkiv" level="style" name="setupblackrules">
+  <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="style" name="setupblackrules">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="width">
@@ -1321,14 +1321,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrule">
+  <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="document" name="blackrule">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupblackrules"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrules">
+  <cd:command category="rules" file="pack-mrl.mkiv" keywords="colors" level="document" name="blackrules">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupblackrules"/>
@@ -1388,6 +1388,20 @@
     <cd:delimiter name="relax"/>
    </cd:arguments>
   </cd:command>
+  <cd:command category="rules" file="node-rul.mkiv" level="style" name="autorule">
+   <cd:arguments>
+    <cd:keywords delimiters="none" list="yes">
+     <cd:constant method="none" prefix="width␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="height␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="depth␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="xoffset␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="yoffset␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="left␣" type="cd:dimension"/>
+     <cd:constant method="none" prefix="right␣" type="cd:dimension"/>
+    </cd:keywords>
+    <cd:delimiter name="relax"/>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-bleed.xml">
   <cd:command category="graphics" file="pack-box.mkiv" level="style" name="setupbleeding">
@@ -1662,7 +1676,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-boxes.xml">
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftext">
+  <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doiftext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1675,7 +1689,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsetext">
+  <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelsetext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1688,7 +1702,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftextelse">
+  <cd:command category="strings" file="supp-box.mkiv" keywords="conditional" level="system" name="doiftextelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1701,7 +1715,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="dowithnextbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -1710,21 +1724,21 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcs">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcs">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="nextboxwd"/>
-  <cd:command file="supp-box.mkiv" level="system" name="nextboxht"/>
-  <cd:command file="supp-box.mkiv" level="system" name="nextboxdp"/>
-  <cd:command file="supp-box.mkiv" level="system" name="nextboxhtdp"/>
-  <cd:command file="supp-box.mkiv" level="system" name="flushnextbox"/>
-  <cd:command file="supp-box.mkiv" level="system" name="nextbox"/>
-  <cd:command file="supp-box.mkiv" level="system" name="nextdepth"/>
-  <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontent">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxwd"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxht"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxdp"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextboxhtdp"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushnextbox"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextbox"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nextdepth"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcontent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -1736,7 +1750,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
@@ -1744,47 +1758,47 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rlap">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rlap">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="llap">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="llap">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="clap">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="clap">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="tlap">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="tlap">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="blap">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="blap">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="reshapebox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="reshapebox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="beginof" end="endof" file="supp-box.mkiv" level="system" name="shapebox" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="flushshapebox"/>
-  <cd:command file="supp-box.mkiv" level="system" name="innerflushshapebox"/>
-  <cd:command file="supp-box.mkiv" level="system" name="shapedhbox">
+  <cd:command begin="beginof" category="boxes" end="endof" file="supp-box.mkiv" level="system" name="shapebox" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushshapebox"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="innerflushshapebox"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shapedhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="processtokens">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="processtokens">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -1803,7 +1817,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="doboundtext">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="doboundtext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1816,7 +1830,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="limitatetext">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatetext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1829,7 +1843,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="limitatetext" variant="list">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatetext" variant="list">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1842,7 +1856,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="limitatefirstline">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="limitatefirstline">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1855,7 +1869,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="processisolatedchars">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="processisolatedchars">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1863,7 +1877,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="processisolatedwords">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="processisolatedwords">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -1871,7 +1885,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytocharacters">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytocharacters">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1879,7 +1893,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytowords">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytowords">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1887,7 +1901,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringchar">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringchar">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1895,7 +1909,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringword">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringword">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1903,7 +1917,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringline">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringline">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1911,7 +1925,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1919,7 +1933,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1927,7 +1941,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced">
+  <cd:command category="strings" file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -1935,58 +1949,58 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="sbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="sbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="linebox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="linebox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="shiftbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shiftbox">
    <cd:arguments>
     <cd:dimension/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hpackbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hpackbox">
    <cd:arguments>
     <cd:dimension/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vpackbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vpackbox">
    <cd:arguments>
     <cd:dimension/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hpackedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hpackedbox">
    <cd:arguments>
     <cd:dimension/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vpackedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vpackedbox">
    <cd:arguments>
     <cd:dimension/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="inlinedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="inlinedbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="struttedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="struttedbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="topskippedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="topskippedbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="centeredbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centeredbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -1994,7 +2008,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="centerednextbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centerednextbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2002,7 +2016,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="centerbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="centerbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2010,7 +2024,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnhsize">
+  <cd:command category="columns" file="supp-box.mkiv" level="system" name="setrigidcolumnhsize">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -2023,7 +2037,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnbalance">
+  <cd:command category="columns" file="supp-box.mkiv" level="system" name="setrigidcolumnbalance">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2031,11 +2045,11 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vboxtohbox" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="vboxtohboxseparator" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="convertvboxtohbox"/>
-  <cd:command file="supp-box.mkiv" level="system" name="hboxestohbox" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="unhhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxtohbox" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxtohboxseparator" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="convertvboxtohbox"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxestohbox" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="unhhbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2047,7 +2061,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hboxofvbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxofvbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2055,7 +2069,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="doifcontent">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifcontent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -2070,8 +2084,8 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="overlay" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="fakebox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="overlay" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="fakebox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2079,7 +2093,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2087,7 +2101,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="cbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="cbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2095,7 +2109,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2103,7 +2117,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="ltop">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="ltop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2111,7 +2125,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="ctop">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="ctop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2119,7 +2133,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rtop">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2127,47 +2141,47 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="tbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="tbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="bbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="mhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="mhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lefthbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lefthbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="midhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="midhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="righthbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="righthbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="boxofsize">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="boxofsize">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="none" list="yes" optional="yes">
@@ -2176,7 +2190,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="limitatelines">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="limitatelines">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -2189,98 +2203,98 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="fittopbaselinegrid">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="fittopbaselinegrid">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="boxcursor"/>
-  <cd:command file="supp-box.mkiv" level="system" name="placedbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="boxcursor"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="placedbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rightbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rightbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="leftbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="leftbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="topbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="topbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="bottombox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottombox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lefttopbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lefttopbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="righttopbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="righttopbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="leftbottombox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="leftbottombox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="rightbottombox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="rightbottombox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="topleftbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="topleftbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="toprightbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="toprightbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="bottomleftbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottomleftbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="bottomrightbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="bottomrightbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="middlebox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="middlebox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="baselinemiddlebox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselinemiddlebox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="baselineleftbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselineleftbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="baselinerightbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="baselinerightbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lrtbbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lrtbbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -2297,12 +2311,12 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="toplinebox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="toplinebox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setstackbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setstackbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2313,14 +2327,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="initializeboxstack">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="initializeboxstack">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="savebox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="savebox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2331,7 +2345,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="flushbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2341,7 +2355,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="restorebox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="restorebox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2351,7 +2365,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="foundbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="foundbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2361,7 +2375,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsebox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelsebox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2377,7 +2391,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifboxelse">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifboxelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2393,7 +2407,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="localpushbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="localpushbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2401,7 +2415,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="localpopbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="localpopbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2409,7 +2423,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="globalpushbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="globalpushbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2417,7 +2431,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="globalpopbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="globalpopbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2425,16 +2439,16 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="removedepth"/>
-  <cd:command file="supp-box.mkiv" level="system" name="obeydepth"/>
-  <cd:command file="supp-box.mkiv" level="system" name="undepthed">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removedepth"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="obeydepth"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="undepthed">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="removebottomthings"/>
-  <cd:command file="supp-box.mkiv" level="system" name="removelastskip"/>
-  <cd:command file="supp-box.mkiv" level="system" name="makestrutofbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removebottomthings"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="removelastskip"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="makestrutofbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2442,7 +2456,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="raisebox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="raisebox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -2451,7 +2465,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lowerbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="alignment" level="system" name="lowerbox">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -2460,17 +2474,17 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="halfwaybox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="halfwaybox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="depthonlybox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="depthonlybox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturalhbox">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2478,7 +2492,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturalvbox">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2486,7 +2500,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturalvtop">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2494,7 +2508,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="naturalvcenter">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="naturalvcenter">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2502,7 +2516,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturalhpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalhpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2510,7 +2524,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturalvpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturalvpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2518,7 +2532,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="naturaltpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="naturaltpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2526,7 +2540,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversehbox">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversehbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2534,7 +2548,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversevbox">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2542,7 +2556,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversevtop">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2550,7 +2564,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversehpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversehpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2558,7 +2572,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversevpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversevpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2566,7 +2580,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-dir.mkiv" level="system" name="reversetpack">
+  <cd:command category="boxes" file="supp-dir.mkiv" level="system" name="reversetpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2574,12 +2588,12 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="frozenhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="frozenhbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setboxllx">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setboxllx">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2590,7 +2604,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setboxlly">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setboxlly">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2601,7 +2615,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="gsetboxllx">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="gsetboxllx">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2612,7 +2626,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="gsetboxlly">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="gsetboxlly">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2623,7 +2637,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getboxllx">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxllx">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2631,7 +2645,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getboxlly">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxlly">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2639,7 +2653,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="directgetboxllx">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directgetboxllx">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2647,7 +2661,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="directgetboxlly">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directgetboxlly">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2655,13 +2669,13 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="shownextbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="shownextbox">
    <cd:arguments>
     <cd:csname/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="spreadhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="spreadhbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2669,7 +2683,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="minimalhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="minimalhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2677,13 +2691,13 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="nodetostring">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="nodetostring">
    <cd:arguments>
     <cd:csname/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getnaturaldimensions">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getnaturaldimensions">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2691,10 +2705,10 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxwd"/>
-  <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxht"/>
-  <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxdp"/>
-  <cd:command file="supp-box.mkiv" level="system" name="naturalwd">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxwd"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxht"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastnaturalboxdp"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="naturalwd">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2702,7 +2716,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional direction" level="system" name="doifelserighttoleftinbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2716,7 +2730,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional direction" level="system" name="doifrighttoleftinboxelse">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2730,15 +2744,15 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="runninghbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="runninghbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vbox" type="environment"/>
-  <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="hbox" type="environment"/>
-  <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vtop" type="environment"/>
-  <cd:command file="supp-box.mkiv" level="system" name="setvboxregister">
+  <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="vbox" type="environment"/>
+  <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="hbox" type="environment"/>
+  <cd:command begin="begin" category="boxes" end="end" file="supp-box.mkiv" level="system" name="vtop" type="environment"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setvboxregister">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2747,7 +2761,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="sethboxregister">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="sethboxregister">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2756,7 +2770,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="setvtopregister">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="setvtopregister">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2765,7 +2779,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="flushboxregister">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="flushboxregister">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2773,7 +2787,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vboxregister" type="environment">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vboxregister" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2781,7 +2795,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hboxregister" type="environment">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hboxregister" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2789,7 +2803,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vtopregister" type="environment">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vtopregister" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -2797,7 +2811,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttolefthbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttolefthbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2805,7 +2819,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlhbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2813,7 +2827,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorighthbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2821,7 +2835,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrhbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2829,7 +2843,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttoleftvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2837,7 +2851,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2845,7 +2859,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorightvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2853,7 +2867,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2861,7 +2875,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="righttoleftvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2869,7 +2883,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="rtlvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2877,7 +2891,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="lefttorightvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2885,7 +2899,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="ltrvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2893,7 +2907,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2901,7 +2915,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2909,7 +2923,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="autodirvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2917,7 +2931,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrighthbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrighthbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2925,7 +2939,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrightvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2933,7 +2947,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvtop">
+  <cd:command category="boxes" file="spac-ali.mkiv" keywords="direction" level="system" name="leftorrightvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -2941,17 +2955,17 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ali.mkiv" level="system" name="ibox">
+  <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="ibox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ali.mkiv" level="system" name="obox">
+  <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="obox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ali.mkiv" level="system" name="definehbox">
+  <cd:command category="boxes" file="spac-ali.mkiv" level="system" name="definehbox">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -2961,7 +2975,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ali.mkiv" generated="yes" level="system" name="hbox" variant="example">
+  <cd:command category="boxes" file="spac-ali.mkiv" generated="yes" level="system" name="hbox" variant="example">
    <cd:sequence>
     <cd:string value="hbox"/>
     <cd:variable value="box"/>
@@ -2970,8 +2984,8 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="lastlinewidth"/>
-  <cd:command file="supp-box.mkiv" level="system" name="putboxincache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="lastlinewidth"/>
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="putboxincache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -2986,7 +3000,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getboxfromcache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="getboxfromcache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3001,7 +3015,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelseboxincache">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="conditional" level="system" name="doifelseboxincache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3018,7 +3032,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="copyboxfromcache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="copyboxfromcache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3033,7 +3047,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="directboxfromcache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directboxfromcache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3044,7 +3058,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="directcopyboxfromcache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="directcopyboxfromcache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3055,14 +3069,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="resetboxesincache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="resetboxesincache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="putnextboxincache">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="putnextboxincache">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -3077,7 +3091,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-buffer.xml">
-  <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifelsebuffer">
+  <cd:command category="buffer" file="buff-ini.mkiv" keywords="conditional" level="system" name="doifelsebuffer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:buffer"/>
@@ -3090,7 +3104,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifbufferelse">
+  <cd:command category="buffer" file="buff-ini.mkiv" keywords="conditional" level="system" name="doifbufferelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:buffer"/>
@@ -3256,7 +3270,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer lua" file="buff-ini.mkiv" level="style" name="ctxluabuffer">
+  <cd:command category="buffer" file="buff-ini.mkiv" keywords="lua" level="style" name="ctxluabuffer">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:buffer"/>
@@ -3277,7 +3291,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="document" name="typebuffer">
+  <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="document" name="typebuffer">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:buffer"/>
@@ -3287,7 +3301,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance">
+  <cd:command category="buffer" file="buff-ver.mkiv" generated="yes" keywords="verbatim" level="document" name="typebuffer" variant="instance">
    <cd:sequence>
     <cd:string value="type"/>
     <cd:instance value="buffer"/>
@@ -3298,7 +3312,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="system" name="typedefinedbuffer">
+  <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="system" name="typedefinedbuffer">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:buffer"/>
@@ -3308,7 +3322,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="prettyprintbuffer">
+  <cd:command category="buffer" file="lxml-ini.mkiv" keywords="verbatim" level="style" name="prettyprintbuffer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:buffer"/>
@@ -3326,7 +3340,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="inlineprettyprintbuffer">
+  <cd:command category="buffer" file="lxml-ini.mkiv" keywords="verbatim" level="style" name="inlineprettyprintbuffer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:buffer"/>
@@ -3344,7 +3358,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="style" name="typeinlinebuffer">
+  <cd:command category="buffer" file="buff-ver.mkiv" keywords="verbatim" level="style" name="typeinlinebuffer">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:buffer"/>
@@ -3356,7 +3370,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-button.xml">
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="definebutton">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="definebutton">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -3369,7 +3383,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="setupbutton">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="setupbutton">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -3404,7 +3418,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example">
+  <cd:command category="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example">
    <cd:sequence>
     <cd:variable value="button"/>
    </cd:sequence>
@@ -3423,7 +3437,7 @@
     <cd:constant value="button"/>
    </cd:instances>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="document" name="button">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="document" name="button">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupbutton"/>
@@ -3436,28 +3450,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:reference"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton" variant="direct">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton" variant="direct">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:reference"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="MPmenubuttons">
+  <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="MPmenubuttons">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:reference"/>
@@ -3467,7 +3481,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -3477,7 +3491,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -3487,7 +3501,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -3499,7 +3513,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -3515,7 +3529,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button">
+  <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupbutton"/>
@@ -3893,6 +3907,10 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
+  <cd:command category="catcode" file="math-ini.mkxl" level="document" name="asciimode"/>
+  <cd:command category="catcode" file="math-ini.mkxl" level="document" name="enableasciimode"/>
+  <cd:command category="catcode" file="math-ini.mkxl" level="document" name="asciimode" type="environment"/>
+  <cd:command category="catcode" file="buff-ver.mkiv" level="document" name="literalmode"/>
  </cd:interface>
  <cd:interface file="i-character.xml">
   <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteropenbrace"/>
@@ -3924,21 +3942,21 @@
   <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftbrace"/>
   <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightbrace"/>
   <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterexclamationmark"/>
-  <cd:command category="characters fonts" file="char-ini.mkiv" level="document" name="utfchar">
+  <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="document" name="utfchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="safechar">
+  <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="safechar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="checkedchar">
+  <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="checkedchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -3948,14 +3966,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchar">
+  <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="textormathchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchars">
+  <cd:command category="characters" file="char-ini.mkiv" keywords="fonts" level="style" name="textormathchars">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -4149,12 +4167,12 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-chemical.xml">
-  <cd:command file="chem-ini.mkiv" level="document" name="molecule">
+  <cd:command category="symbols" file="chem-ini.mkiv" level="document" name="molecule">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="chem-ini.mkiv" level="document" name="chem">
+  <cd:command category="symbols" file="chem-ini.mkiv" level="document" name="chem">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -4371,9 +4389,9 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-cleaning.xml">
-  <cd:command begin="push" end="pop" file="typo-chr.mkiv" level="system" name="punctuation" type="environment"/>
-  <cd:command file="typo-chr.mkiv" level="system" name="removepunctuation"/>
-  <cd:command file="typo-chr.mkiv" level="system" name="markcontent">
+  <cd:command begin="push" category="language" end="pop" file="typo-chr.mkiv" level="system" name="punctuation" type="environment"/>
+  <cd:command category="language" file="typo-chr.mkiv" level="system" name="removepunctuation"/>
+  <cd:command category="language" file="typo-chr.mkiv" level="system" name="markcontent">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="reset"/>
@@ -4383,7 +4401,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="typo-chr.mkiv" level="system" name="markedcontent" type="environment">
+  <cd:command category="language" file="typo-chr.mkiv" level="system" name="markedcontent" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="reset"/>
@@ -4392,14 +4410,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="typo-chr.mkiv" level="system" name="removemarkedcontent">
+  <cd:command category="language" file="typo-chr.mkiv" level="system" name="removemarkedcontent">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="typo-chr.mkiv" level="system" name="doifelsemarkedcontent">
+  <cd:command category="language" file="typo-chr.mkiv" keywords="conditional" level="system" name="doifelsemarkedcontent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -4412,7 +4430,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="typo-cln.mkiv" level="system" name="setcharactercleaning">
+  <cd:command category="language" file="typo-cln.mkiv" level="system" name="setcharactercleaning">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="reset"/>
@@ -5146,7 +5164,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifelsecolor">
+  <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifelsecolor">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:color"/>
@@ -5159,7 +5177,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolorelse">
+  <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifcolorelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:color"/>
@@ -5172,7 +5190,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolor">
+  <cd:command category="colors" file="color-ini.mkiv" keywords="conditional" level="system" name="doifcolor">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:color"/>
@@ -5252,7 +5270,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelseblack">
+  <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifelseblack">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:color"/>
@@ -5265,7 +5283,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifblackelse">
+  <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifblackelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:color"/>
@@ -5278,7 +5296,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack">
+  <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifelsedrawingblack">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -5288,7 +5306,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse">
+  <cd:command category="colors" file="colo-ini.mkiv" keywords="conditional" level="system" name="doifdrawingblackelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -5463,7 +5481,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix">
+  <cd:command category="tables" file="pack-com.mkiv" keywords="float" level="document" name="floatcombination" type="environment" variant="matrix">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:matrix"/>
@@ -5471,7 +5489,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment">
+  <cd:command category="tables" file="pack-com.mkiv" keywords="float" level="document" name="floatcombination" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupcombination"/>
@@ -5480,7 +5498,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-commandhandler.xml">
-  <cd:command file="mult-aux.mkiv" level="system" name="installparameterhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparameterhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5488,7 +5506,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installrootparameterhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installrootparameterhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5496,7 +5514,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installparameterhashhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparameterhashhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5504,7 +5522,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installparametersethandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparametersethandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5512,7 +5530,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5520,7 +5538,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdefinehandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinehandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5529,7 +5547,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installsetuphandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsetuphandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5537,7 +5555,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installswitchsetuphandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installswitchsetuphandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5545,7 +5563,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installautosetuphandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installautosetuphandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5553,7 +5571,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installbasicparameterhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installbasicparameterhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5561,7 +5579,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5570,7 +5588,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installcommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5579,7 +5597,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installswitchcommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installswitchcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5588,7 +5606,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installautocommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installautocommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5597,7 +5615,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installsimplecommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsimplecommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5606,7 +5624,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdirectparameterhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectparameterhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5614,7 +5632,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdirectsetuphandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectsetuphandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5622,7 +5640,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdirectparametersethandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectparametersethandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5630,7 +5648,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5638,7 +5656,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdirectcommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdirectcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5646,7 +5664,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5654,7 +5672,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="relateparameterhandlers">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="relateparameterhandlers">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -5670,28 +5688,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installactionhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installactionhandler">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installnamespace">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installnamespace">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installcorenamespace">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installcorenamespace">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="definenamespace">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="definenamespace">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -5729,8 +5747,8 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="listnamespaces"/>
-  <cd:command file="mult-aux.mkiv" level="system" name="showparentchain">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="listnamespaces"/>
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="showparentchain">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5738,7 +5756,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="doifelsecommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifelsecommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5752,7 +5770,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandlerelse">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifcommandhandlerelse">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5766,7 +5784,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5777,7 +5795,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="doifnotcommandhandler">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="conditional" level="system" name="doifnotcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5788,7 +5806,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionset">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinitionset">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5796,7 +5814,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionsetmember">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installdefinitionsetmember">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5808,7 +5826,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installparentinjector">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="installparentinjector">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5816,7 +5834,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-rul.mkiv" level="system" name="installframedcommandhandler">
+  <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installframedcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5825,7 +5843,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-rul.mkiv" level="system" name="installframedautocommandhandler">
+  <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installframedautocommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5834,7 +5852,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler">
+  <cd:command category="commandhandler" file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -5843,12 +5861,12 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installmacrostack">
+  <cd:command category="system" file="mult-aux.mkiv" level="system" name="installmacrostack">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="installglobalmacrostack">
+  <cd:command category="system" file="mult-aux.mkiv" level="system" name="installglobalmacrostack">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
@@ -6004,231 +6022,245 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="romannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="romannumerals">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:number"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Romannumerals">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:number"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="Romannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnodotnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="abjadnaivenumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnodotnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="hebrewnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnaivenumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="yiddishnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="languagecharacters">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="languagecharacters">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="languageCharacters">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="languageCharacters">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="alphabeticnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="alphabeticnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="Alphabeticnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Alphabeticnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="thainumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="thainumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="devanagarinumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="devanagarinumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="gurmurkhinumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="gurmurkhinumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="gujaratinumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="gujaratinumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="tibetannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="tibetannumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="greeknumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="greeknumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="Greeknumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Greeknumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="persiannumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicdecimals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicdecimals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiandecimals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="persiandecimals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicexnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="arabicexnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsp">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumeralsp">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsc">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreannumeralsc">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreanparentnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreanparentnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreancirclenumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="koreancirclenumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesenumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chinesenumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesecapnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chinesecapnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="chineseallnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="chineseallnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="character">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="character">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="Character">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Character">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="characters">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="characters">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="Characters">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="Characters">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -6352,7 +6384,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifelseleapyear">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="style" name="doifelseleapyear">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -6365,7 +6397,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifleapyearelse">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="style" name="doifleapyearelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -6398,31 +6430,112 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="document" name="currentdate">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="definedate">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords list="yes">
+     <cd:constant type="year"/>
+     <cd:constant method="range" prefix="year" type="cd:name"/>
+     <cd:constant type="y"/>
+     <cd:constant method="range" prefix="y" type="cd:name"/>
+     <cd:constant type="yy"/>
+     <cd:constant type="Y"/>
+     <cd:constant method="range" prefix="Y" type="cd:name"/>
+     <cd:constant type="YY"/>
+     <cd:constant type="month"/>
+     <cd:constant type="month:mnem"/>
+     <cd:constant type="month:hebrew"/>
+     <cd:constant type="month:jalali"/>
+     <cd:constant type="m"/>
+     <cd:constant type="m:mnem"/>
+     <cd:constant type="m:hebrew"/>
+     <cd:constant type="m:jalali"/>
+     <cd:constant type="MONTH"/>
+     <cd:constant type="MONTH:mnem"/>
+     <cd:constant type="MONTH:hebrew"/>
+     <cd:constant type="MONTH:jalali"/>
+     <cd:constant type="mm"/>
+     <cd:constant type="M"/>
+     <cd:constant type="day"/>
+     <cd:constant method="range" prefix="day" type="cd:name"/>
+     <cd:constant type="day:+"/>
+     <cd:constant type="day:ord"/>
+     <cd:constant type="day:++"/>
+     <cd:constant type="day:highord"/>
+     <cd:constant type="d"/>
+     <cd:constant method="range" prefix="d" type="cd:name"/>
+     <cd:constant type="d:+"/>
+     <cd:constant type="d:ord"/>
+     <cd:constant type="d:++"/>
+     <cd:constant type="d:highord"/>
+     <cd:constant type="dd"/>
+     <cd:constant type="dd:+"/>
+     <cd:constant type="dd:ord"/>
+     <cd:constant type="dd:++"/>
+     <cd:constant type="dd:highord"/>
+     <cd:constant type="D"/>
+     <cd:constant type="D:+"/>
+     <cd:constant type="D:ord"/>
+     <cd:constant type="D:++"/>
+     <cd:constant type="D:highord"/>
+     <cd:constant type="weekday"/>
+     <cd:constant type="weekday:mnem"/>
+     <cd:constant type="weekday:hebrew"/>
+     <cd:constant type="weekday:jalali"/>
+     <cd:constant type="w"/>
+     <cd:constant type="w:mnem"/>
+     <cd:constant type="w:hebrew"/>
+     <cd:constant type="w:jalali"/>
+     <cd:constant type="WEEKDAY"/>
+     <cd:constant type="WEEKDAY:mnem"/>
+     <cd:constant type="WEEKDAY:hebrew"/>
+     <cd:constant type="WEEKDAY:jalali"/>
+     <cd:constant type="W"/>
+     <cd:constant type="referral"/>
+     <cd:constant type="space"/>
+     <cd:constant type="\\\\\\\\␣"/>
+     <cd:constant type="cd:text"/>
+     <cd:constant type="hebrew:to"/>
+     <cd:constant type="jalali:to"/>
+     <cd:constant type="jalali:from"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="currentdate">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="year"/>
+     <cd:constant method="range" prefix="year" type="cd:name"/>
      <cd:constant type="y"/>
+     <cd:constant method="range" prefix="y" type="cd:name"/>
      <cd:constant type="yy"/>
      <cd:constant type="Y"/>
+     <cd:constant method="range" prefix="Y" type="cd:name"/>
      <cd:constant type="YY"/>
      <cd:constant type="month"/>
      <cd:constant type="month:mnem"/>
+     <cd:constant type="month:hebrew"/>
      <cd:constant type="month:jalali"/>
      <cd:constant type="m"/>
      <cd:constant type="m:mnem"/>
+     <cd:constant type="m:hebrew"/>
      <cd:constant type="m:jalali"/>
      <cd:constant type="MONTH"/>
      <cd:constant type="MONTH:mnem"/>
+     <cd:constant type="MONTH:hebrew"/>
      <cd:constant type="MONTH:jalali"/>
      <cd:constant type="mm"/>
      <cd:constant type="M"/>
      <cd:constant type="day"/>
+     <cd:constant method="range" prefix="day" type="cd:name"/>
      <cd:constant type="day:+"/>
      <cd:constant type="day:ord"/>
      <cd:constant type="day:++"/>
      <cd:constant type="day:highord"/>
      <cd:constant type="d"/>
+     <cd:constant method="range" prefix="d" type="cd:name"/>
      <cd:constant type="d:+"/>
      <cd:constant type="d:ord"/>
      <cd:constant type="d:++"/>
@@ -6439,21 +6552,35 @@
      <cd:constant type="D:highord"/>
      <cd:constant type="weekday"/>
      <cd:constant type="weekday:mnem"/>
+     <cd:constant type="weekday:hebrew"/>
+     <cd:constant type="weekday:jalali"/>
      <cd:constant type="w"/>
      <cd:constant type="w:mnem"/>
+     <cd:constant type="w:hebrew"/>
+     <cd:constant type="w:jalali"/>
      <cd:constant type="WEEKDAY"/>
      <cd:constant type="WEEKDAY:mnem"/>
+     <cd:constant type="WEEKDAY:hebrew"/>
+     <cd:constant type="WEEKDAY:jalali"/>
      <cd:constant type="W"/>
      <cd:constant type="referral"/>
      <cd:constant type="space"/>
      <cd:constant type="\\\\\\\\␣"/>
      <cd:constant type="cd:text"/>
+     <cd:constant type="hebrew:to"/>
      <cd:constant type="jalali:to"/>
      <cd:constant type="jalali:from"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="document" name="date">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="currentdate" variant="name">
+   <cd:arguments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="date">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="d">
@@ -6467,7 +6594,88 @@
      </cd:parameter>
     </cd:assignments>
     <cd:keywords list="yes" optional="yes">
-     <cd:inherit name="currentdate"/>
+     <cd:constant type="year"/>
+     <cd:constant method="range" prefix="year" type="cd:name"/>
+     <cd:constant type="y"/>
+     <cd:constant method="range" prefix="y" type="cd:name"/>
+     <cd:constant type="yy"/>
+     <cd:constant type="Y"/>
+     <cd:constant method="range" prefix="Y" type="cd:name"/>
+     <cd:constant type="YY"/>
+     <cd:constant type="month"/>
+     <cd:constant type="month:mnem"/>
+     <cd:constant type="month:hebrew"/>
+     <cd:constant type="month:jalali"/>
+     <cd:constant type="m"/>
+     <cd:constant type="m:mnem"/>
+     <cd:constant type="m:hebrew"/>
+     <cd:constant type="m:jalali"/>
+     <cd:constant type="MONTH"/>
+     <cd:constant type="MONTH:mnem"/>
+     <cd:constant type="MONTH:hebrew"/>
+     <cd:constant type="MONTH:jalali"/>
+     <cd:constant type="mm"/>
+     <cd:constant type="M"/>
+     <cd:constant type="day"/>
+     <cd:constant method="range" prefix="day" type="cd:name"/>
+     <cd:constant type="day:+"/>
+     <cd:constant type="day:ord"/>
+     <cd:constant type="day:++"/>
+     <cd:constant type="day:highord"/>
+     <cd:constant type="d"/>
+     <cd:constant method="range" prefix="d" type="cd:name"/>
+     <cd:constant type="d:+"/>
+     <cd:constant type="d:ord"/>
+     <cd:constant type="d:++"/>
+     <cd:constant type="d:highord"/>
+     <cd:constant type="dd"/>
+     <cd:constant type="dd:+"/>
+     <cd:constant type="dd:ord"/>
+     <cd:constant type="dd:++"/>
+     <cd:constant type="dd:highord"/>
+     <cd:constant type="D"/>
+     <cd:constant type="D:+"/>
+     <cd:constant type="D:ord"/>
+     <cd:constant type="D:++"/>
+     <cd:constant type="D:highord"/>
+     <cd:constant type="weekday"/>
+     <cd:constant type="weekday:mnem"/>
+     <cd:constant type="weekday:hebrew"/>
+     <cd:constant type="weekday:jalali"/>
+     <cd:constant type="w"/>
+     <cd:constant type="w:mnem"/>
+     <cd:constant type="w:hebrew"/>
+     <cd:constant type="w:jalali"/>
+     <cd:constant type="WEEKDAY"/>
+     <cd:constant type="WEEKDAY:mnem"/>
+     <cd:constant type="WEEKDAY:hebrew"/>
+     <cd:constant type="WEEKDAY:jalali"/>
+     <cd:constant type="W"/>
+     <cd:constant type="referral"/>
+     <cd:constant type="space"/>
+     <cd:constant type="\\\\\\\\␣"/>
+     <cd:constant type="cd:text"/>
+     <cd:constant type="hebrew:to"/>
+     <cd:constant type="jalali:to"/>
+     <cd:constant type="jalali:from"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="document" name="date" variant="name">
+   <cd:arguments>
+    <cd:assignments list="yes">
+     <cd:parameter name="d">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
+     <cd:parameter name="m">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
+     <cd:parameter name="y">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
+    </cd:assignments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
@@ -6529,7 +6737,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="defineconversion" variant="list">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="defineconversion" variant="list">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:language"/>
@@ -6578,6 +6786,8 @@
      <cd:constant type="abjadnumerals"/>
      <cd:constant type="abjadnodotnumerals"/>
      <cd:constant type="abjadnaivenumerals"/>
+     <cd:constant type="hebrewnumerals"/>
+     <cd:constant type="yiddishnumerals"/>
      <cd:constant type="thainumerals"/>
      <cd:constant type="devanagarinumerals"/>
      <cd:constant type="gurmurkhinumerals"/>
@@ -6632,7 +6842,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversiondefined">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifelseconversiondefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -6645,7 +6855,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversiondefinedelse">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifconversiondefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -6658,7 +6868,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversionnumber">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifelseconversionnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -6674,7 +6884,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversionnumberelse">
+  <cd:command category="counter" file="core-con.mkiv" keywords="conditional" level="system" name="doifconversionnumberelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -6753,42 +6963,42 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="sloveniannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="sloveniannumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="slovenianNumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="slovenianNumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishnumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="spanishnumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishNumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="spanishNumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="russiannumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="russiannumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter language" file="core-con.mkiv" level="style" name="russianNumerals">
+  <cd:command category="counter" file="core-con.mkiv" keywords="language" level="style" name="russianNumerals">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -6816,9 +7026,9 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="system" file="core-con.lua" level="style" name="actualyear"/>
-  <cd:command category="system" file="core-con.lua" level="style" name="actualmonth"/>
-  <cd:command category="system" file="core-con.lua" level="style" name="actualday"/>
+  <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualyear"/>
+  <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualmonth"/>
+  <cd:command category="counter" file="core-con.lua" keywords="system" level="style" name="actualday"/>
   <cd:command category="counter" file="syst-con.mkxl" level="style" name="lchexnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
@@ -6996,7 +7206,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsecounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifelsecounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7009,7 +7219,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounterelse">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifcounterelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7022,7 +7232,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifcounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7032,7 +7242,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifnotcounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifnotcounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7331,7 +7541,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifelsedefinedcounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7344,7 +7554,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifdefinedcounterelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7357,7 +7567,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifdefinedcounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7367,7 +7577,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifundefinedcounter">
+  <cd:command category="counter" file="strc-num.mkiv" keywords="conditional" level="system" name="doifundefinedcounter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -7936,7 +8146,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-digits.xml">
-  <cd:command file="typo-dig.mkiv" level="system" name="setdigitsmanipulation">
+  <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="system" name="setdigitsmanipulation">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="reset"/>
@@ -7944,15 +8154,15 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="typo-dig.mkiv" level="system" name="resetdigitsmanipulation"/>
-  <cd:command file="typo-dig.mkiv" level="document" name="equaldigits">
+  <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="system" name="resetdigitsmanipulation"/>
+  <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="document" name="equaldigits">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="typo-dig.mkiv" level="document" name="dummydigit"/>
+  <cd:command category="symbols" file="typo-dig.mkiv" keywords="fonts" level="document" name="dummydigit"/>
  </cd:interface>
  <cd:interface file="i-dimension.xml">
   <cd:command file="mult-dim.mkvi" level="system" name="assigndimension">
@@ -8035,7 +8245,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-direction.xml">
-  <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setupdirections">
+  <cd:command category="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="setupdirections">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="bidi">
@@ -8060,15 +8270,15 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setdirection">
+  <cd:command category="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="setdirection">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="resetdirection"/>
-  <cd:command category="alignment" file="supp-dir.mkiv" level="document" name="showdirsinmargin"/>
+  <cd:command category="language" file="typo-dir.mkiv" keywords="alignment" level="style" name="resetdirection"/>
+  <cd:command category="alignment" file="supp-dir.mkiv" keywords="alignment" level="document" name="showdirsinmargin"/>
  </cd:interface>
  <cd:interface file="i-document.xml">
   <cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/>
@@ -8329,7 +8539,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-dummy.xml">
-  <cd:command file="mult-aux.mkiv" level="system" name="getdummyparameters">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="getdummyparameters">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="cd:key">
@@ -8338,21 +8548,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="dummyparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="dummyparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="directdummyparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="directdummyparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="setdummyparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="setdummyparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -8362,7 +8572,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-aux.mkiv" level="system" name="letdummyparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" level="system" name="letdummyparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -8370,7 +8580,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="mult-aux.mkiv" level="system" name="usedummystyleandcolor">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="fonts colors" level="system" name="usedummystyleandcolor">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -8380,14 +8590,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts" file="mult-aux.mkiv" level="system" name="usedummystyleparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="fonts" level="system" name="usedummystyleparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="colors" file="mult-aux.mkiv" level="system" name="usedummycolorparameter">
+  <cd:command category="commandhandler" file="mult-aux.mkiv" keywords="colors" level="system" name="usedummycolorparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -8917,7 +9127,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doifelsefieldcategory">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -8930,7 +9140,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doiffieldcategoryelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -8989,7 +9199,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldbody">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doifelsefieldbody">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -9002,7 +9212,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldbodyelse">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="conditional" level="system" name="doiffieldbodyelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -9079,7 +9289,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background rules" file="scrn-fld.mkvi" level="document" name="fitfieldframed">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background rules" level="document" name="fitfieldframed">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupframed"/>
@@ -9097,7 +9307,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldlabelframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -9107,7 +9317,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldcontentframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -9118,7 +9328,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfieldtotalframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -9147,7 +9357,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfield">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfield">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -9170,7 +9380,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfields">
+  <cd:command category="pdf" file="scrn-fld.mkvi" keywords="background" level="style" name="setupfields">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="reset"/>
@@ -9294,7 +9504,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffile">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9304,7 +9514,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifnotfile">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifnotfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9314,7 +9524,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefile">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsefile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9327,7 +9537,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileelse">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffileelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9357,7 +9567,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepath">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsepath">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9370,7 +9580,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathelse">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifpathelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9383,7 +9593,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefileexists">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsefileexists">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9396,7 +9606,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileexistselse">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doiffileexistselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9409,7 +9619,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepathexists">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelsepathexists">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9422,7 +9632,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathexistselse">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifpathexistselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9435,7 +9645,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelseparentfile">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifelseparentfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9448,7 +9658,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifparentfileelse">
+  <cd:command category="structure" file="file-ini.mkvi" keywords="conditional" level="system" name="doifparentfileelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9475,7 +9685,7 @@
   <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitofftype"/>
   <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffkind"/>
   <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffroot"/>
-  <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifelseinputfile">
+  <cd:command category="structure" file="file-job.mkvi" keywords="conditional" level="system" name="doifelseinputfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9488,7 +9698,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifinputfileelse">
+  <cd:command category="structure" file="file-job.mkvi" keywords="conditional" level="system" name="doifinputfileelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9577,14 +9787,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafile">
+  <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadluafile">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfile">
+  <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadcldfile">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -9605,14 +9815,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafileonce">
+  <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadluafileonce">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfileonce">
+  <cd:command category="structure" file="file-job.mkvi" keywords="lua" level="system" name="loadcldfileonce">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -9640,7 +9850,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readjobfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readjobfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9653,7 +9863,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readlocfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readlocfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9666,7 +9876,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsysfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readsysfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9679,7 +9889,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfixfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readfixfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9695,7 +9905,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsetfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readsetfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:path"/>
@@ -9711,7 +9921,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9731,7 +9941,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readtexfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="readtexfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9744,7 +9954,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional xml" file="file-res.mkvi" level="system" name="readxmlfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional xml" level="system" name="readxmlfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9757,7 +9967,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doifelselocfile">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="doifelselocfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9770,7 +9980,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doiflocfileelse">
+  <cd:command category="structure" file="file-res.mkvi" keywords="conditional" level="system" name="doiflocfileelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -9817,6 +10027,13 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="structure" file="font-ini.mklx" keywords="fonts" level="system" name="usefontpath">
+   <cd:arguments>
+    <cd:keywords list="yes">
+     <cd:constant type="cd:path"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-filler.xml">
   <cd:command category="rules" file="spac-flr.mkiv" level="style" name="definefiller">
@@ -9939,7 +10156,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller">
+  <cd:command category="rules" file="spac-flr.mkiv" level="document" name="dotfill"/>
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="definelinefiller">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -9952,7 +10170,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefiller">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10008,7 +10226,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefillers">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10018,7 +10236,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="linefiller" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="filler"/>
@@ -10029,7 +10247,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setlinefiller">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="filler"/>
@@ -10142,7 +10360,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-firstline.xml">
-  <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="definefirstline">
+  <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="style" name="definefirstline">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -10155,7 +10373,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="setupfirstline">
+  <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="style" name="setupfirstline">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10179,14 +10397,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="typo-fln.mkiv" level="document" name="setfirstline">
+  <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="document" name="setfirstline">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="typo-fln.mkiv" level="system" name="applytofirstcharacter">
+  <cd:command category="fonts" file="typo-fln.mkiv" keywords="colors" level="system" name="applytofirstcharacter">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -10196,7 +10414,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-fittingpage.xml">
-  <cd:command category="background layout" file="page-app.mkiv" level="style" name="definefittingpage">
+  <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="definefittingpage">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -10209,7 +10427,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupfittingpage">
+  <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="setupfittingpage">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10237,7 +10455,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background layout" file="page-app.mkiv" level="document" name="fittingpage" type="environment">
+  <cd:command category="layout" file="page-app.mkiv" keywords="background" level="document" name="fittingpage" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -10247,7 +10465,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background layout" file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance">
+  <cd:command category="layout" file="page-app.mkiv" generated="yes" keywords="background" level="document" name="fittingpage" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="fittingpage"/>
    </cd:sequence>
@@ -10261,7 +10479,7 @@
     <cd:constant value="MPpage"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage">
+  <cd:command category="layout" file="page-app.mkiv" keywords="background" level="style" name="setupTEXpage">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="pagestate">
@@ -10286,7 +10504,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage">
+  <cd:command category="layout" file="meta-fig.mkiv" keywords="background metapost" level="style" name="setupMPpage">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="pagestate">
@@ -10564,7 +10782,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="setupcaption">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10696,7 +10914,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="setupcaptions">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -10706,7 +10924,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="placefloatcaption">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="fonts counter" level="style" name="placefloatcaption">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -10735,7 +10953,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure background" file="strc-flt.mkvi" level="style" name="setupfloatframed">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="background" level="style" name="setupfloatframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -11251,7 +11469,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelserightpagefloat">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelserightpagefloat">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11261,7 +11479,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifrightpagefloatelse">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifrightpagefloatelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11271,7 +11489,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelseoddpagefloat">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelseoddpagefloat">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11281,7 +11499,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifoddpagefloatelse">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifoddpagefloatelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11291,7 +11509,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelsemainfloatbody">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifelsemainfloatbody">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11301,7 +11519,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifmainfloatbodyelse">
+  <cd:command category="structure" file="strc-flt.mkvi" keywords="conditional" level="system" name="doifmainfloatbodyelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -11339,7 +11557,7 @@
    </cd:arguments>
   </cd:command>
   <cd:command category="structure" file="strc-flt.mkvi" level="system" name="forcelocalfloats"/>
-  <cd:command category="structure counter" file="tabl-tsp.mkiv" level="style" name="setupfloatsplitting">
+  <cd:command category="structure" file="tabl-tsp.mkiv" keywords="counter" level="style" name="setupfloatsplitting">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="before">
@@ -11372,7 +11590,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="tabl-tsp.mkiv" level="system" name="doifnotinsidesplitfloat">
+  <cd:command category="structure" file="tabl-tsp.mkiv" keywords="conditional" level="system" name="doifnotinsidesplitfloat">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -12162,7 +12380,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature">
+  <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifelsecurrentfonthasfeature">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12175,7 +12393,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse">
+  <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifcurrentfonthasfeatureelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12188,7 +12406,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsefontfeature">
+  <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifelsefontfeature">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12201,7 +12419,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doiffontfeatureelse">
+  <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doiffontfeatureelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12214,7 +12432,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifunknownfontfeature">
+  <cd:command category="fonts" file="font-fea.mkvi" keywords="conditional" level="system" name="doifunknownfontfeature">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12338,7 +12556,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doifelsefontsynonym">
+  <cd:command category="fonts" file="font-fil.mkvi" keywords="conditional" level="system" name="doifelsefontsynonym">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -12351,7 +12569,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doiffontsynonymelse">
+  <cd:command category="fonts" file="font-fil.mkvi" keywords="conditional" level="system" name="doiffontsynonymelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -13185,7 +13403,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelseitalic">
+  <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifelseitalic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -13195,7 +13413,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifitalicelse">
+  <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifitalicelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -13311,7 +13529,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelsefontchar">
+  <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doifelsefontchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:font"/>
@@ -13327,7 +13545,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doiffontcharelse">
+  <cd:command category="fonts" file="font-sym.mkvi" keywords="conditional" level="system" name="doiffontcharelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:font"/>
@@ -13351,7 +13569,7 @@
    </cd:arguments>
   </cd:command>
   <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showfontdata"/>
-  <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doifelsefontpresent">
+  <cd:command category="fonts" file="font-tra.mkiv" keywords="conditional" level="system" name="doifelsefontpresent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:font"/>
@@ -13364,7 +13582,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doiffontpresentelse">
+  <cd:command category="fonts" file="font-tra.mkiv" keywords="conditional" level="system" name="doiffontpresentelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:font"/>
@@ -13601,13 +13819,6 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts" file="font-ini.mkvi" level="style" name="addfontpath">
-   <cd:arguments>
-    <cd:keywords list="yes">
-     <cd:constant type="cd:path"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
   <cd:command category="fonts" file="hand-ini.mkx" level="style" name="defineexpansion">
    <cd:arguments>
     <cd:keywords>
@@ -14097,6 +14308,7 @@
       <cd:constant type="yes"/>
       <cd:constant type="no"/>
       <cd:constant default="yes" type="auto"/>
+      <cd:constant type="hidden"/>
      </cd:parameter>
      <cd:parameter name="left">
       <cd:constant type="cd:number"/>
@@ -14193,7 +14405,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-framed.xml">
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14206,7 +14418,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14427,21 +14639,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="frameddimension">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="frameddimension">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedparameter">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="framedparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="framed">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupframed"/>
@@ -14449,7 +14661,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance">
+  <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framed" variant="instance">
    <cd:sequence>
     <cd:instance value="framed"/>
    </cd:sequence>
@@ -14464,7 +14676,7 @@
     <cd:constant value="fitfieldframed"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="normalframedwithsettings">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="normalframedwithsettings">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupframed"/>
@@ -14472,7 +14684,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed" type="environment">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="framed" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14482,7 +14694,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="fastlocalframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="fastlocalframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14493,7 +14705,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="localframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14504,7 +14716,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="directlocalframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="directlocalframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14512,7 +14724,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframedwithsettings">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="localframedwithsettings">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14523,7 +14735,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="placeframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="placeframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14534,7 +14746,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="inframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="document" name="inframed">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupframed"/>
@@ -14542,7 +14754,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="definemathframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background mathematics" level="style" name="definemathframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14555,7 +14767,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="setupmathframed">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background mathematics" level="style" name="setupmathframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14565,7 +14777,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules mathematics" file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance">
+  <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background mathematics" level="document" name="mathframed" variant="instance">
    <cd:sequence>
     <cd:instance value="mathframed"/>
    </cd:sequence>
@@ -14581,7 +14793,7 @@
     <cd:constant value="mcframed"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="defineformulaframed">
+  <cd:command category="rules" file="math-for.mkiv" keywords="background mathematics" level="style" name="defineformulaframed">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14594,7 +14806,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="setupformulaframed">
+  <cd:command category="rules" file="math-for.mkiv" keywords="background mathematics" level="style" name="setupformulaframed">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14604,7 +14816,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedtext">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframedtext">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14617,7 +14829,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtext">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedtext">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14660,7 +14872,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtexts">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedtexts">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14670,7 +14882,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance">
+  <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framedtext" variant="instance">
    <cd:sequence>
     <cd:instance value="framedtext"/>
    </cd:sequence>
@@ -14684,7 +14896,7 @@
     <cd:constant value="framedtext"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance">
+  <cd:command category="rules" file="pack-rul.mkiv" generated="yes" keywords="background" level="document" name="framedtext" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="framedtext"/>
    </cd:sequence>
@@ -14703,7 +14915,7 @@
     <cd:constant value="framedtext"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedcontent">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="defineframedcontent">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14716,7 +14928,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedcontent">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="style" name="setupframedcontent">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -14748,7 +14960,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedcontent" type="environment">
+  <cd:command category="rules" file="pack-rul.mkiv" keywords="background" level="system" name="framedcontent" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14756,7 +14968,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installleftframerenderer">
+  <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installleftframerenderer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -14766,7 +14978,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installrightframerenderer">
+  <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installrightframerenderer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -14776,7 +14988,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installtopframerenderer">
+  <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installtopframerenderer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -14786,7 +14998,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installbottomframerenderer">
+  <cd:command category="rules" file="pack-fen.mkiv" keywords="background" level="system" name="installbottomframerenderer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -14796,7 +15008,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background rules" level="system" name="doifelseframed">
+  <cd:command category="rules" file="pack-rul.mkxl" keywords="background conditional" level="system" name="doifelseframed">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -14809,7 +15021,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-framedtable.xml">
-  <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="defineframedtable">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="defineframedtable">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -14819,7 +15031,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtable">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtable">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14841,7 +15053,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablerow">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtablerow">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14855,7 +15067,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablecolumn">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="style" name="setupframedtablecolumn">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14869,7 +15081,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedtable" type="environment">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedtable" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -14879,14 +15091,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedrow" type="environment">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedrow" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupframed"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedcell" type="environment">
+  <cd:command category="tables" file="tabl-frm.mkiv" keywords="background rules" level="document" name="framedcell" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupframed"/>
@@ -15198,7 +15410,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doifelsefigure">
+  <cd:command category="graphics" file="grph-inc.mkiv" keywords="conditional" level="system" name="doifelsefigure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -15211,7 +15423,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doiffigureelse">
+  <cd:command category="graphics" file="grph-inc.mkiv" keywords="conditional" level="system" name="doiffigureelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -15384,7 +15596,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbuffer">
+  <cd:command category="graphics" file="grph-fig.mkiv" keywords="buffer" level="document" name="typesetbuffer">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="*"/>
@@ -15395,7 +15607,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbufferonly">
+  <cd:command category="graphics" file="grph-fig.mkiv" keywords="buffer" level="document" name="typesetbufferonly">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="*"/>
@@ -15403,7 +15615,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics structure" file="grph-fig.mkiv" level="style" name="definetypesetting">
+  <cd:command category="graphics" file="grph-fig.mkiv" keywords="structure" level="style" name="definetypesetting">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -15416,7 +15628,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics structure" file="grph-fig.mkiv" level="document" name="typesetfile">
+  <cd:command category="graphics" file="grph-fig.mkiv" keywords="structure" level="document" name="typesetfile">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -15821,7 +16033,7 @@
     <cd:constant value="helptext"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifelsehelp">
+  <cd:command category="pdf" file="scrn-hlp.mkvi" keywords="conditional" level="system" name="doifelsehelp">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -15831,7 +16043,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifhelpelse">
+  <cd:command category="pdf" file="scrn-hlp.mkvi" keywords="conditional" level="system" name="doifhelpelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -15874,7 +16086,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-highlight.xml">
-  <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="definehighlight">
+  <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="style" name="definehighlight">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -15887,7 +16099,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="setuphighlight">
+  <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="style" name="setuphighlight">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -15907,7 +16119,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example">
+  <cd:command category="fonts" file="core-sys.mkiv" generated="yes" keywords="colors" level="document" name="highlight" variant="example">
    <cd:sequence>
     <cd:variable value="highlight"/>
    </cd:sequence>
@@ -15917,7 +16129,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight">
+  <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="highlight">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -15927,14 +16139,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight" type="environment">
+  <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="highlight" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="directhighlight">
+  <cd:command category="fonts" file="core-sys.mkiv" keywords="colors" level="document" name="directhighlight">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -16033,9 +16245,9 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="leftskipadaption"/>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="rightskipadaption"/>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetleftskipadaption">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="leftskipadaption"/>
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="rightskipadaption"/>
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="dosetleftskipadaption">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16045,7 +16257,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetrightskipadaption">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="dosetrightskipadaption">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16055,7 +16267,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptleftskip">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="doadaptleftskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16065,7 +16277,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptrightskip">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="doadaptrightskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16470,83 +16682,7 @@
   </cd:command>
   <cd:command begin="push" category="layout" end="pop" file="page-imp.mkiv" level="system" name="arrangedpages" type="environment"/>
  </cd:interface>
- <cd:interface file="i-indent.xml">
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="defineindenting">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:keywords list="yes">
-     <cd:constant method="none" prefix="cd:sign" type="small"/>
-     <cd:constant method="none" prefix="cd:sign" type="medium"/>
-     <cd:constant method="none" prefix="cd:sign" type="big"/>
-     <cd:constant type="none"/>
-     <cd:constant type="no"/>
-     <cd:constant type="not"/>
-     <cd:constant type="first"/>
-     <cd:constant type="next"/>
-     <cd:constant type="yes"/>
-     <cd:constant type="always"/>
-     <cd:constant type="never"/>
-     <cd:constant type="odd"/>
-     <cd:constant type="even"/>
-     <cd:constant type="normal"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="toggle"/>
-     <cd:constant type="cd:dimension"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setupindenting">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant method="none" prefix="cd:sign" type="small"/>
-     <cd:constant method="none" prefix="cd:sign" type="medium"/>
-     <cd:constant method="none" prefix="cd:sign" type="big"/>
-     <cd:constant type="none"/>
-     <cd:constant type="no"/>
-     <cd:constant type="not"/>
-     <cd:constant type="first"/>
-     <cd:constant type="next"/>
-     <cd:constant type="yes"/>
-     <cd:constant type="always"/>
-     <cd:constant type="never"/>
-     <cd:constant type="odd"/>
-     <cd:constant type="even"/>
-     <cd:constant type="normal"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="toggle"/>
-     <cd:constant type="cd:dimension"/>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="synchronizeindenting"/>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentingparameter">
-   <cd:arguments>
-    <cd:csname/>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="indentation"/>
-  <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="noindentation"/>
-  <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="system" name="doindentation"/>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="checknextindentation">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="yes"/>
-     <cd:constant type="no"/>
-     <cd:constant type="auto"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentnextparameter">
-   <cd:arguments>
-    <cd:csname/>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dorechecknextindentation"/>
-  <cd:command begin="push" category="whitespace" end="pop" file="spac-hor.mkiv" level="system" name="indentation" type="environment"/>
- </cd:interface>
+ <error/>
  <cd:interface file="i-indentedtext.xml">
   <cd:command category="structure" file="strc-ind.mkiv" level="style" name="defineindentedtext">
    <cd:arguments>
@@ -16790,7 +16926,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifelseinsertion">
+  <cd:command category="structure" file="page-ins.mkiv" keywords="conditional" level="system" name="doifelseinsertion">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -16803,7 +16939,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifinsertionelse">
+  <cd:command category="structure" file="page-ins.mkiv" keywords="conditional" level="system" name="doifinsertionelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -16952,7 +17088,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doifelselocation">
+  <cd:command category="pdf" file="scrn-ini.mkvi" keywords="conditional" level="system" name="doifelselocation">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -16962,7 +17098,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doiflocationelse">
+  <cd:command category="pdf" file="scrn-ini.mkvi" keywords="conditional" level="system" name="doiflocationelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -17340,10 +17476,10 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-interface.xml">
-  <cd:command file="mult-ini.mkiv" level="system" name="defaultinterface"/>
-  <cd:command file="mult-ini.mkiv" level="system" name="currentinterface"/>
-  <cd:command file="mult-ini.mkiv" level="system" name="currentresponses"/>
-  <cd:command file="mult-ini.mkiv" level="system" name="interface" type="environment">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defaultinterface"/>
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="currentinterface"/>
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="currentresponses"/>
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="interface" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="all"/>
@@ -17351,7 +17487,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceconstant">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfaceconstant">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17361,7 +17497,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="defineinterfacevariable">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfacevariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17371,7 +17507,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceelement">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="defineinterfaceelement">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17381,7 +17517,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="definefileconstant">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definefileconstant">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17391,28 +17527,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="definesystemconstant">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definesystemconstant">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="definemessageconstant">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definemessageconstant">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="definesystemvariable">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="definesystemvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setinterfacemessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="setinterfacemessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17427,7 +17563,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setmessagetext">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="setmessagetext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17438,8 +17574,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="currentmessagetext"/>
-  <cd:command file="mult-ini.mkiv" level="system" name="getmessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="currentmessagetext"/>
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="getmessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17450,7 +17586,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="doifelsemessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" keywords="conditional" level="system" name="doifelsemessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17467,7 +17603,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="doifmessageelse">
+  <cd:command category="tracker" file="mult-ini.mkiv" keywords="conditional" level="system" name="doifmessageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17484,7 +17620,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="showmessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="showmessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17498,7 +17634,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="writestatus">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="writestatus">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -17508,28 +17644,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="message">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="message">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="inlinemessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="inlinemessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="displaymessage">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="displaymessage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="showwarning">
+  <cd:command category="tracker" file="mult-ini.mkiv" level="system" name="showwarning">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17543,7 +17679,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceconstant">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfaceconstant">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17553,7 +17689,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setinterfacevariable">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfacevariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17563,7 +17699,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceelement">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfaceelement">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17573,7 +17709,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="mult-ini.mkiv" level="system" name="setinterfacecommand">
+  <cd:command category="interface" file="mult-ini.mkiv" level="system" name="setinterfacecommand">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -17971,7 +18107,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup">
+  <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroup">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -18197,7 +18333,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment">
+  <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroup" variant="assignment">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -18419,7 +18555,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroups">
+  <cd:command category="structure" file="strc-itm.mkvi" keywords="counter" level="style" name="setupitemgroups">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -18641,7 +18777,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure counter" file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance">
+  <cd:command category="structure" file="strc-itm.mkvi" generated="yes" keywords="counter" level="style" name="setupitemgroup" variant="instance">
    <cd:sequence>
     <cd:string value="setup"/>
     <cd:instance value="itemgroup"/>
@@ -19104,7 +19240,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-kerning.xml">
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="definecharacterkerning">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="definecharacterkerning">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -19117,7 +19253,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupcharacterkerning">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setupcharacterkerning">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -19143,7 +19279,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setcharacterkerning">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setcharacterkerning">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="reset"/>
@@ -19151,8 +19287,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="resetcharacterkerning"/>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" generated="yes" level="document" name="characterkerning" variant="example">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="resetcharacterkerning"/>
+  <cd:command category="fonts" file="typo-krn.mkiv" generated="yes" keywords="whitespace" level="document" name="characterkerning" variant="example">
    <cd:sequence>
     <cd:variable value="characterkerning"/>
    </cd:sequence>
@@ -19165,7 +19301,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="kerncharacters">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="kerncharacters">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:number"/>
@@ -19175,7 +19311,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="letterspacing">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="letterspacing">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:number"/>
@@ -19185,7 +19321,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="stretched">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="document" name="stretched">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupstretched"/>
@@ -19195,14 +19331,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupstretched">
+  <cd:command category="fonts" file="typo-krn.mkiv" keywords="whitespace" level="style" name="setupstretched">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupcharacterkerning"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="defineperiodkerning">
+  <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="defineperiodkerning">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -19215,7 +19351,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setupperiodkerning">
+  <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="setupperiodkerning">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -19227,7 +19363,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setperiodkerning">
+  <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="setperiodkerning">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="reset"/>
@@ -19235,7 +19371,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="resetperiodkerning"/>
+  <cd:command category="fonts" file="typo-pnc.mkic" keywords="whitespace" level="style" name="resetperiodkerning"/>
  </cd:interface>
  <cd:interface file="i-label.xml">
   <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel">
@@ -19808,7 +19944,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelselanguage">
+  <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifelselanguage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:language"/>
@@ -19821,7 +19957,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doiflanguageelse">
+  <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doiflanguageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:language"/>
@@ -19834,7 +19970,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelsepatterns">
+  <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifelsepatterns">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:language"/>
@@ -19847,7 +19983,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifpatternselse">
+  <cd:command category="language" file="lang-ini.mkiv" keywords="conditional" level="system" name="doifpatternselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:language"/>
@@ -20229,7 +20365,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doifelselayerdata">
+  <cd:command category="background" file="pack-lyr.mkiv" keywords="conditional" level="system" name="doifelselayerdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -20242,7 +20378,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doiflayerdataelse">
+  <cd:command category="background" file="pack-lyr.mkiv" keywords="conditional" level="system" name="doiflayerdataelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -20257,7 +20393,7 @@
   </cd:command>
   <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerwidth"/>
   <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerheight"/>
-  <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="setMPlayer">
+  <cd:command category="background" file="pack-lyr.mkiv" keywords="metapost" level="document" name="setMPlayer">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -20271,7 +20407,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="getMPlayer">
+  <cd:command category="background" file="pack-lyr.mkiv" keywords="metapost" level="document" name="getMPlayer">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -20508,7 +20644,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelselayoutdefined">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifelselayoutdefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -20521,7 +20657,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doiflayoutdefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -20557,7 +20693,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelseoddpage">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifelseoddpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -20567,7 +20703,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifoddpageelse">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifoddpageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -20577,7 +20713,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifbothsidesoverruled">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -20590,7 +20726,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsides">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="doifbothsides">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -20603,7 +20739,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="rightorleftpageaction">
+  <cd:command category="layout" file="page-lay.mkiv" keywords="conditional" level="system" name="rightorleftpageaction">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -20681,7 +20817,7 @@
   </cd:command>
   <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/>
   <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/>
-  <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doifelsetopofpage">
+  <cd:command category="layout" file="page-ini.mkiv" keywords="conditional" level="system" name="doifelsetopofpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -20691,7 +20827,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doiftopofpageelse">
+  <cd:command category="layout" file="page-ini.mkiv" keywords="conditional" level="system" name="doiftopofpageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -20703,7 +20839,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-linefiller.xml">
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="definelinefiller">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -20716,7 +20852,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefiller">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -20773,7 +20909,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefillers">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -20783,7 +20919,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="linefiller" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="filler"/>
@@ -20794,7 +20930,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller">
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setlinefiller">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="filler"/>
@@ -20802,6 +20938,39 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillerhbox">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="none" optional="yes">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillervbox">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="none" optional="yes">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost boxes" level="document" name="linefillervtop">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="none" optional="yes">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-linenumber.xml">
   <cd:command category="structure" file="page-lin.mkvi" level="style" name="definelinenumbering">
@@ -20950,7 +21119,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifelsesamelinereference">
+  <cd:command category="structure" file="page-lin.mkvi" keywords="conditional" level="system" name="doifelsesamelinereference">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:reference"/>
@@ -20963,7 +21132,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse">
+  <cd:command category="structure" file="page-lin.mkvi" keywords="conditional" level="system" name="doifsamelinereferenceelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:reference"/>
@@ -20995,34 +21164,42 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-lines.xml">
-  <cd:command file="supp-box.mkiv" level="system" name="noflines"/>
-  <cd:command file="supp-box.mkiv" level="system" name="getnoflines">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="noflines"/>
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getnoflines">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getroundednoflines">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getroundednoflines">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="getrawnoflines">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="getrawnoflines">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="determinenoflines">
+  <cd:command category="boxes" file="supp-box.mkiv" keywords="strings" level="system" name="determinenoflines">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-lin.mkiv" level="style" name="definelines">
+  <cd:command category="boxes" file="supp-box.lua" level="system" name="noflinesinbox">
+   <cd:arguments>
+    <cd:keywords delimiters="none">
+     <cd:constant type="cd:csname"/>
+     <cd:constant type="cd:number"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="structure" file="spac-lin.mkiv" level="style" name="definelines">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -21035,7 +21212,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-lin.mkiv" level="style" name="setuplines">
+  <cd:command category="structure" file="spac-lin.mkiv" level="style" name="setuplines">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -21082,10 +21259,14 @@
      <cd:parameter name="right">
       <cd:constant type="cd:command"/>
      </cd:parameter>
+     <cd:parameter list="yes" name="indentlist">
+      <cd:constant type="cd:dimension"/>
+      <cd:constant type="*"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance">
+  <cd:command category="structure" file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="lines"/>
    </cd:sequence>
@@ -21098,7 +21279,7 @@
     <cd:constant value="lines"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="spac-lin.mkiv" level="document" name="emptylines">
+  <cd:command category="whitespace" file="spac-lin.mkiv" level="document" name="emptylines">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:number"/>
@@ -21209,7 +21390,7 @@
   <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetable" type="environment"/>
   <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablehead" type="environment"/>
   <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablebody" type="environment"/>
-  <cd:command category="tables buffer" file="tabl-ltb.mkiv" level="document" name="processlinetablebuffer">
+  <cd:command category="tables" file="tabl-ltb.mkiv" keywords="buffer" level="document" name="processlinetablebuffer">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:buffer"/>
@@ -21513,7 +21694,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelselist">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelselist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:list"/>
@@ -21526,7 +21707,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doiflistelse">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doiflistelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:list"/>
@@ -21750,7 +21931,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelsestructurelisthaspage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -21760,7 +21941,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifstructurelisthaspageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -21770,7 +21951,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifelsestructurelisthasnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -21780,7 +21961,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse">
+  <cd:command category="structure" file="strc-lst.mkvi" keywords="conditional" level="system" name="doifstructurelisthasnumberelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -22470,7 +22651,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-makeup.xml">
-  <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="definemakeup">
+  <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="style" name="definemakeup">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -22483,7 +22664,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="setupmakeup">
+  <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="style" name="setupmakeup">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -22584,7 +22765,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mak.mkvi" level="document" name="makeup" type="environment">
+  <cd:command category="structure" file="page-mak.mkvi" keywords="layout" level="document" name="makeup" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -22594,7 +22775,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance">
+  <cd:command category="structure" file="page-mak.mkvi" generated="yes" keywords="layout" level="document" name="makeup" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="makeup"/>
     <cd:string value="makeup"/>
@@ -22613,7 +22794,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-marginblock.xml">
-  <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="definemarginblock">
+  <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="style" name="definemarginblock">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -22626,7 +22807,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="setupmarginblock">
+  <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="style" name="setupmarginblock">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -22679,7 +22860,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mbk.mkvi" level="document" name="marginblock" type="environment">
+  <cd:command category="structure" file="page-mbk.mkvi" keywords="layout" level="document" name="marginblock" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -22897,7 +23078,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-marking.xml">
-  <cd:command file="strc-mar.mkiv" level="style" name="definemarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="definemarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -22910,7 +23091,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="setupmarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="setupmarking">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:mark"/>
@@ -22933,7 +23114,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="system" name="relatemarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="system" name="relatemarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -22943,7 +23124,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="setmarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="setmarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -22953,14 +23134,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="system" name="resetmarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="system" name="resetmarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="system" name="synchronizemarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="system" name="synchronizemarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -22973,7 +23154,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifelsemarking">
+  <cd:command category="structure" file="strc-mar.mkiv" keywords="conditional" level="system" name="doifelsemarking">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:mark"/>
@@ -22986,7 +23167,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifmarkingelse">
+  <cd:command category="structure" file="strc-mar.mkiv" keywords="conditional" level="system" name="doifmarkingelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:mark"/>
@@ -22999,7 +23180,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="getmarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="getmarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23029,7 +23210,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchonemark">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchonemark">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23054,21 +23235,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarks">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchtwomarks">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarks">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchallmarks">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchmark">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchmark">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23093,7 +23274,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchmarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchmarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23123,7 +23304,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchonemarking">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchonemarking">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23153,7 +23334,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarkings">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchtwomarkings">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23165,7 +23346,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarkings">
+  <cd:command category="structure" file="strc-mar.mkiv" level="style" name="fetchallmarkings">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:mark"/>
@@ -23759,7 +23940,7 @@
   <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="unstackscripts"/>
  </cd:interface>
  <cd:interface file="i-mathalignment.xml">
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathalignment">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="definemathalignment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -23772,7 +23953,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathalignment">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="setupmathalignment">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -23812,7 +23993,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance">
+  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="alignment" level="document" name="mathalignment" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="mathalignment"/>
    </cd:sequence>
@@ -23828,7 +24009,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-mathcases.xml">
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathcases">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="definemathcases">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -23841,7 +24022,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathcases">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="alignment" level="style" name="setupmathcases">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -23870,7 +24051,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance">
+  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="alignment" level="document" name="mathcases" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="mathcases"/>
    </cd:sequence>
@@ -24359,7 +24540,7 @@
   <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="checkedfences" type="environment"/>
  </cd:interface>
  <cd:interface file="i-mathmatrix.xml">
-  <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="definemathmatrix">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="style" name="definemathmatrix">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -24372,7 +24553,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="setupmathmatrix">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="style" name="setupmathmatrix">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -24416,7 +24597,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance">
+  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="mathmatrix"/>
    </cd:sequence>
@@ -24430,7 +24611,7 @@
     <cd:constant value="mathmatrix"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix">
+  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix">
    <cd:sequence>
     <cd:variable value="mathmatrix"/>
    </cd:sequence>
@@ -24438,7 +24619,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment">
+  <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="document" name="matrices" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupmathmatrix"/>
@@ -24474,18 +24655,18 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix">
+  <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bordermatrix">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix">
+  <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bbordermatrix">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix" type="environment"/>
-  <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix" type="environment"/>
+  <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bordermatrix" type="environment"/>
+  <cd:command category="mathematics" file="math-pln.mkiv" keywords="tables" level="document" name="bbordermatrix" type="environment"/>
  </cd:interface>
  <cd:interface file="i-mathornament.xml">
   <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathornament">
@@ -25135,7 +25316,7 @@
   <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="iff"/>
  </cd:interface>
  <cd:interface file="i-metapost.xml">
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPdefinitions" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPdefinitions" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces" optional="yes">
      <cd:constant type="metafun"/>
@@ -25155,7 +25336,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPextensions" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPextensions" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes" optional="yes">
      <cd:constant type="metafun"/>
@@ -25175,8 +25356,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinitializations" type="environment"/>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinitializations" type="environment"/>
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinclusions" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="+"/>
@@ -25199,7 +25380,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPinclusions">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="+"/>
@@ -25223,7 +25404,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="defineMPinstance">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="defineMPinstance">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -25236,7 +25417,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPinstance">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPinstance">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -25275,50 +25456,50 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="system" name="resetMPinstance">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="system" name="resetMPinstance">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPfigurefile">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="processMPfigurefile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPdrawing" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="-"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="resetMPdrawing"/>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="getMPdrawing"/>
-  <cd:command begin="push" category="graphics metapost" end="pop" file="meta-ini.mkiv" level="system" name="MPdrawing" type="environment"/>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="resetMPdrawing"/>
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="getMPdrawing"/>
+  <cd:command begin="push" category="graphics" end="pop" file="meta-ini.mkiv" keywords="metapost" level="system" name="MPdrawing" type="environment"/>
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPdrawing">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPclip" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPclip" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost fonts" file="meta-ini.mkiv" level="system" name="MPfontsizehskip">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost fonts" level="system" name="MPfontsizehskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:font"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="setupMPvariables">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPvariables">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -25330,7 +25511,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="setMPvariables">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPvariables">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -25342,7 +25523,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="setMPvariable">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPvariable">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -25354,7 +25535,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="system" name="MPrawvar">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="system" name="MPrawvar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25364,21 +25545,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="MPvariable">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="MPvar">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPvar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="meta-ini.mkiv" level="style" name="useMPvariables">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPvariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -25388,7 +25569,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPgraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25398,7 +25579,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPgraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25410,7 +25591,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPgraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25420,7 +25601,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPgraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25432,7 +25613,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usableMPgraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="usableMPgraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25442,7 +25623,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reuseMPgraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reuseMPgraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25454,7 +25635,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reusableMPgraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25464,7 +25645,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="reusableMPgraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25476,7 +25657,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPpagegraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25486,7 +25667,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="uniqueMPpagegraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25498,21 +25679,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPbuffer">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="processMPbuffer">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="runMPbuffer">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="runMPbuffer">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPenvironment" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPenvironment" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="reset"/>
@@ -25521,15 +25702,15 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="resetMPenvironment"/>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPenvironmentbuffer">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="resetMPenvironment"/>
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPenvironmentbuffer">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPcode" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces" optional="yes">
      <cd:constant type="metafun"/>
@@ -25549,7 +25730,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPcode">
    <cd:arguments>
     <cd:keywords delimiters="braces" optional="yes">
      <cd:constant type="metafun"/>
@@ -25570,14 +25751,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPrun" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="MPrun" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces" optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="useMPrun">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="document" name="useMPrun">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25587,14 +25768,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPlibrary">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="useMPlibrary">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setMPtext">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setMPtext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25604,28 +25785,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPtext">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPtext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPstring">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPbetex">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="MPbetex">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifelseMPgraphic">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost conditional" level="style" name="doifelseMPgraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25638,7 +25819,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifMPgraphicelse">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost conditional" level="style" name="doifMPgraphicelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25651,14 +25832,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPfigure" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="staticMPfigure" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPgraphic" type="environment">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="staticMPgraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -25668,7 +25849,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usestaticMPfigure">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="usestaticMPfigure">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupscale"/>
@@ -25678,7 +25859,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPgraphics">
+  <cd:command category="graphics" file="meta-ini.mkiv" keywords="metapost" level="style" name="setupMPgraphics">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="color">
@@ -25693,7 +25874,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-mixedcolumns.xml">
-  <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="definemixedcolumns">
+  <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="style" name="definemixedcolumns">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -25706,7 +25887,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="setupmixedcolumns">
+  <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="style" name="setupmixedcolumns">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -25789,7 +25970,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment">
+  <cd:command category="columns" file="page-mix.mkiv" keywords="structure layout" level="document" name="mixedcolumns" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -25799,7 +25980,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance">
+  <cd:command category="columns" file="page-mix.mkiv" generated="yes" keywords="structure layout" level="document" name="mixedcolumns" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="mixedcolumns"/>
    </cd:sequence>
@@ -25814,7 +25995,7 @@
     <cd:constant value="columns"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure layout" file="page-smp.mkiv" level="style" name="setupcolumns">
+  <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="style" name="setupcolumns">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupmixedcolumns"/>
@@ -25926,7 +26107,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelsemode">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifelsemode">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -25939,7 +26120,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmodeelse">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifmodeelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -25952,7 +26133,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmode">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifmode">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -25962,7 +26143,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotmode">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifnotmode">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -25986,7 +26167,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelseallmodes">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifelseallmodes">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -25999,7 +26180,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodeselse">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifallmodeselse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -26012,7 +26193,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodes">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifallmodes">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -26025,7 +26206,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotallmodes">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="style" name="doifnotallmodes">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -26091,7 +26272,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-modules.xml">
-  <cd:command file="file-mod.mkvi" level="style" name="usemodule">
+  <cd:command category="structure" file="file-mod.mkvi" level="style" name="usemodule">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="m"/>
@@ -26110,7 +26291,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="style" name="usetexmodule">
+  <cd:command category="structure" file="file-mod.mkvi" level="style" name="usetexmodule">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="m"/>
@@ -26129,21 +26310,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="module" type="environment">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="module" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="module" type="environment" variant="string">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="module" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="setupmodule">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="setupmodule">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:file"/>
@@ -26159,7 +26340,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="moduleparameter">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="moduleparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -26169,15 +26350,15 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="currentmoduleparameter">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="currentmoduleparameter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/>
-  <cd:command file="file-mod.mkvi" level="system" name="fetchruntinecommand">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/>
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="fetchruntinecommand">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -26185,14 +26366,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="luaenvironment">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="luaenvironment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:file"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="file-mod.mkvi" level="system" name="useluamodule">
+  <cd:command category="structure" file="file-mod.mkvi" level="system" name="useluamodule">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -26201,7 +26382,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-narrow.xml">
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="definenarrower">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="style" name="definenarrower">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -26214,7 +26395,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="setupnarrower">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="style" name="setupnarrower">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -26247,7 +26428,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrower" type="environment">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrower" type="environment">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant method="none" prefix="cd:sign" type="left"/>
@@ -26261,7 +26442,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example">
+  <cd:command category="whitespace" file="spac-hor.mkiv" generated="yes" keywords="layout" level="document" name="narrower" type="environment" variant="example">
    <cd:sequence>
     <cd:variable value="narrower"/>
    </cd:sequence>
@@ -26278,7 +26459,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -26288,7 +26469,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -26305,7 +26486,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment">
+  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="document" name="narrow" type="environment" variant="assignment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupnarrower"/>
@@ -26324,7 +26505,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-naturaltable.xml">
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="style" name="setupTABLE">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="style" name="setupTABLE">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="r"/>
@@ -26444,21 +26625,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLE" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLE" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEnested" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnested" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TD" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TD" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="nx">
@@ -26486,77 +26667,77 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TR" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TR" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TC" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TC" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="bTD"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TX" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TX" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="bTD"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TY" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TY" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TH" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TH" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="bTD"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TN" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TN" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="bTD"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEhead" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEhead" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEnext" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnext" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEbody" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEbody" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TABLEfoot" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEfoot" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="style" name="defineTABLEsetup">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="style" name="defineTABLEsetup">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -26566,49 +26747,49 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TDs" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TDs" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" level="document" name="TRs" type="environment">
+  <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TRs" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLE" type="environment">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLE" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEhead" type="environment">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEhead" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEnext" type="environment">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEnext" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEbody" type="environment">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEbody" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-ntb.mkxl" level="document" name="TABLEfoot" type="environment">
+  <cd:command category="tables" file="tabl-ntb.mkxl" keywords="background rules" level="document" name="TABLEfoot" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupTABLE"/>
@@ -26617,7 +26798,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-note.xml">
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotation">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotation">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -26801,7 +26982,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotations">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotations">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -26811,7 +26992,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment">
+  <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" type="environment" variant="instance:assignment">
    <cd:sequence>
     <cd:instance value="note"/>
    </cd:sequence>
@@ -26836,7 +27017,7 @@
     <cd:constant value="endnote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance">
+  <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="note"/>
    </cd:sequence>
@@ -26850,7 +27031,7 @@
     <cd:constant value="endnote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance">
+  <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" variant="instance">
    <cd:sequence>
     <cd:instance value="note"/>
    </cd:sequence>
@@ -26867,7 +27048,7 @@
     <cd:constant value="endnote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment">
+  <cd:command category="structure" file="strc-not.mkvi" generated="yes" keywords="notes" level="document" name="note" variant="instance:assignment">
    <cd:sequence>
     <cd:instance value="note"/>
    </cd:sequence>
@@ -26892,7 +27073,7 @@
     <cd:constant value="endnote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="definenote">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="definenote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -26905,7 +27086,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnote">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnote">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -27048,7 +27229,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupnotes">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -27058,14 +27239,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupfootnotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="setupfootnotes">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupnote"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27078,7 +27259,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote" variant="assignment">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnote" variant="assignment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27099,7 +27280,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnotetext">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27112,7 +27293,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext" variant="assignment">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="setnotetext" variant="assignment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27133,7 +27314,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placenotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placenotes">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
@@ -27143,14 +27324,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localnotes" type="environment">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="localnotes" type="environment">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalnotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placelocalnotes">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27160,10 +27341,10 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="postponenotes"/>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="flushnotes"/>
-  <cd:command category="structure notes" file="strc-not.mkvi" name="postponingnotes" type="environment"/>
-  <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="postponenotes"/>
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="style" name="flushnotes"/>
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" name="postponingnotes" type="environment"/>
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifelsenoteonsamepage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27176,7 +27357,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifnoteonsamepageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27189,7 +27370,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnotescollected">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes conditional" level="system" name="doifnotescollected">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27199,7 +27380,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="system" name="notesymbol">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="system" name="notesymbol">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27209,7 +27390,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="note">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="note">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -27219,7 +27400,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="footnotetext">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:reference"/>
@@ -27229,7 +27410,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext" variant="assignment">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="footnotetext" variant="assignment">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="title">
@@ -27247,22 +27428,22 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placefootnotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placefootnotes">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupnote"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localfootnotes" type="environment"/>
-  <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalfootnotes">
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="localfootnotes" type="environment"/>
+  <cd:command category="structure" file="strc-not.mkvi" keywords="notes" level="document" name="placelocalfootnotes">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupnote"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="definelinenote">
+  <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="style" name="definelinenote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27275,7 +27456,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="setuplinenote">
+  <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="style" name="setuplinenote">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -27303,7 +27484,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance">
+  <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="linenote" variant="instance">
    <cd:sequence>
     <cd:instance value="linenote"/>
    </cd:sequence>
@@ -27316,7 +27497,7 @@
     <cd:constant value="linenote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance">
+  <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="startlinenote" variant="instance">
    <cd:sequence>
     <cd:string value="start"/>
     <cd:instance value="linenote"/>
@@ -27333,7 +27514,7 @@
     <cd:constant value="linenote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance">
+  <cd:command category="structure" file="strc-lnt.mkvi" generated="yes" keywords="notes" level="document" name="stoplinenote" variant="instance">
    <cd:sequence>
     <cd:string value="stop"/>
     <cd:instance value="linenote"/>
@@ -27347,7 +27528,7 @@
     <cd:constant value="linenote"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="fromlinenote">
+  <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="document" name="fromlinenote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:reference"/>
@@ -27357,14 +27538,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="tolinenote">
+  <cd:command category="structure" file="strc-lnt.mkvi" keywords="notes" level="document" name="tolinenote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:reference"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="definetextnote">
+  <cd:command category="structure" file="strc-tnt.mkiv" keywords="notes" level="style" name="definetextnote">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27377,7 +27558,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="setuptextnote">
+  <cd:command category="structure" file="strc-tnt.mkiv" keywords="notes" level="style" name="setuptextnote">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -27402,7 +27583,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure notes" file="strc-tnt.mkiv" generated="yes" level="document" name="textnote">
+  <cd:command category="structure" file="strc-tnt.mkiv" generated="yes" keywords="notes" level="document" name="textnote">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setuptextnote"/>
@@ -27524,7 +27705,7 @@
   </cd:command>
   <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectreference"/>
   <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectpage"/>
-  <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectfound">
+  <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifelseobjectfound">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27540,7 +27721,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectfoundelse">
+  <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifobjectfoundelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27556,7 +27737,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound">
+  <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifelseobjectreferencefound">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27572,7 +27753,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse">
+  <cd:command category="pdf" file="pack-obj.mkiv" keywords="conditional" level="system" name="doifobjectreferencefoundelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27590,7 +27771,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-offset.xml">
-  <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffsetbox">
+  <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="style" name="setupoffsetbox">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="x">
@@ -27641,14 +27822,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffset">
+  <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="style" name="setupoffset">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupoffsetbox"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="pack-box.mkiv" level="system" name="offsetbox">
+  <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="system" name="offsetbox">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupoffsetbox"/>
@@ -27657,7 +27838,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="pack-box.mkiv" level="document" name="offset">
+  <cd:command category="boxes" file="pack-box.mkiv" keywords="layout" level="document" name="offset">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupoffset"/>
@@ -27763,7 +27944,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="pack-ori.mkxl" level="system" name="doifelseorientation">
+  <cd:command category="alignment" file="pack-ori.mkxl" keywords="conditional" level="system" name="doifelseorientation">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="normal"/>
@@ -27785,7 +27966,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-ornament.xml">
-  <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="collector">
+  <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="collector">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="alternative">
@@ -27810,7 +27991,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="layer">
+  <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="layer">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="alternative">
@@ -27828,7 +28009,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="direct">
+  <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="document" name="ornamenttext" variant="direct">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27839,7 +28020,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="collector">
+  <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="style" name="defineornament" variant="collector">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27863,7 +28044,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="layer">
+  <cd:command category="background" file="pack-box.mkiv" keywords="fonts colors" level="style" name="defineornament" variant="layer">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -27880,7 +28061,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background fonts colors" file="pack-box.mkiv" generated="yes" level="document" name="ornament" variant="example">
+  <cd:command category="background" file="pack-box.mkiv" generated="yes" keywords="fonts colors" level="document" name="ornament" variant="example">
    <cd:sequence>
     <cd:variable value="ornament"/>
    </cd:sequence>
@@ -27956,14 +28137,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaycolor"/>
-  <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaylinecolor"/>
+  <cd:command category="background colors" file="pack-rul.mkiv" keywords="background colors" level="system" name="overlaycolor"/>
+  <cd:command category="background colors" file="pack-rul.mkiv" keywords="background colors" level="system" name="overlaylinecolor"/>
   <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaywidth"/>
   <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayheight"/>
   <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaydepth"/>
   <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayoffset"/>
   <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaylinewidth"/>
-  <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifelseoverlay">
+  <cd:command category="background" file="pack-rul.mkiv" keywords="conditional" level="system" name="doifelseoverlay">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27976,7 +28157,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifoverlayelse">
+  <cd:command category="background" file="pack-rul.mkiv" keywords="conditional" level="system" name="doifoverlayelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -27991,7 +28172,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagebreak.xml">
-  <cd:command file="page-brk.mkiv" level="style" name="definepagebreak">
+  <cd:command category="structure" file="page-brk.mkiv" level="style" name="definepagebreak">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28026,7 +28207,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="pagebreak">
+  <cd:command category="structure" file="page-brk.mkiv" level="document" name="pagebreak">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="empty"/>
@@ -28059,14 +28240,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="page">
+  <cd:command category="structure" file="page-brk.mkiv" level="document" name="page">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:inherit name="pagebreak"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="style" name="definecolumnbreak">
+  <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="style" name="definecolumnbreak">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28083,7 +28264,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="columnbreak">
+  <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="columnbreak">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="yes"/>
@@ -28098,14 +28279,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="column">
+  <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="column">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:inherit name="columnbreak"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="style" name="definepagechecker">
+  <cd:command category="structure" file="page-brk.mkiv" level="style" name="definepagechecker">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28118,7 +28299,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="style" name="setuppagechecker">
+  <cd:command category="structure" file="page-brk.mkiv" level="style" name="setuppagechecker">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -28148,7 +28329,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="checkpage">
+  <cd:command category="structure" file="page-brk.mkiv" level="document" name="checkpage">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28158,7 +28339,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="testpage">
+  <cd:command category="structure" file="page-brk.mkiv" level="document" name="testpage">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:number"/>
@@ -28168,7 +28349,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="system" name="testpageonly">
+  <cd:command category="structure" file="page-brk.mkiv" level="system" name="testpageonly">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:number"/>
@@ -28178,7 +28359,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="system" name="testpagesync">
+  <cd:command category="structure" file="page-brk.mkiv" level="system" name="testpagesync">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:number"/>
@@ -28188,7 +28369,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-brk.mkiv" level="document" name="testcolumn">
+  <cd:command category="structure" file="page-brk.mkiv" keywords="columns" level="document" name="testcolumn">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:number"/>
@@ -28200,7 +28381,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagecolumns.xml">
-  <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="definepagecolumns">
+  <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="style" name="definepagecolumns">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28213,7 +28394,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="setuppagecolumns">
+  <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="style" name="setuppagecolumns">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -28254,21 +28435,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment" variant="name">
+  <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="document" name="pagecolumns" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment">
+  <cd:command category="columns" file="page-pcl.mkiv" keywords="structure layout" level="document" name="pagecolumns" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setuppagecolumns"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-pcl.mkiv" generated="yes" level="document" name="pagecolumns" type="environment" variant="instance">
+  <cd:command category="columns" file="page-pcl.mkiv" generated="yes" keywords="structure layout" level="document" name="pagecolumns" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="pagecolumns"/>
    </cd:sequence>
@@ -28340,7 +28521,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagegrid.xml">
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnset">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnset">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28353,7 +28534,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnset">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnset">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -28396,7 +28577,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="columnset" type="environment" variant="example">
+  <cd:command category="columns" file="page-cst.mkiv" generated="yes" keywords="structure layout" level="document" name="columnset" type="environment" variant="example">
    <cd:sequence>
     <cd:variable value="columnset"/>
    </cd:sequence>
@@ -28406,7 +28587,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnset" type="environment">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="document" name="columnset" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -28416,7 +28597,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetspan">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnsetspan">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28429,7 +28610,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetspan">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetspan">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -28455,7 +28636,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnsetspan" type="environment">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="document" name="columnsetspan" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28487,14 +28668,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="columnsetspanwidth">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="columnsetspanwidth">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetarea">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="definecolumnsetarea">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28507,7 +28688,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetarea">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetarea">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -28547,7 +28728,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetareatext">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetareatext">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28557,7 +28738,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetlines">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetlines">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28573,7 +28754,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetstart">
+  <cd:command category="columns" file="page-cst.mkiv" keywords="structure layout" level="style" name="setupcolumnsetstart">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -28725,14 +28906,14 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagenumber.xml">
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="setuprealpagenumber">
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="setuprealpagenumber">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupcounter"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupuserpagenumber">
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setupuserpagenumber">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="viewerprefix">
@@ -28749,14 +28930,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupsubpagenumber">
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setupsubpagenumber">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:inherit name="setupcounter"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber">
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setuppagenumber">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="viewerprefix">
@@ -28773,10 +28954,10 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetuserpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="resetsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumbering">
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="resetuserpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="resetsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="resetpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="setuppagenumbering">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="alternative">
@@ -28829,44 +29010,44 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstrealpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstuserpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastrealpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastuserpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevrealpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevuserpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextrealpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextuserpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstrealpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstuserpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstsubpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevrealpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevuserpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevsubpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextrealpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextuserpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextsubpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastrealpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastuserpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastsubpage"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="realpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="userpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="subpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="pagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prefixedpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementsubpagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="completepagenumber"/>
-  <cd:command category="counter" file="strc-pag.mkiv" level="style" name="placepagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstrealpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstuserpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="firstsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastrealpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastuserpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="lastsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevrealpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevuserpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prevsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextrealpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextuserpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="nextsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstrealpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstuserpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="firstsubpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevrealpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevuserpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="prevsubpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextrealpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextuserpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="nextsubpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastrealpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastuserpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="system" name="lastsubpage"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="realpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="userpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="subpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="pagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="prefixedpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="incrementpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="incrementsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="decrementpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="decrementsubpagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="completepagenumber"/>
+  <cd:command category="counter" file="strc-pag.mkiv" keywords="structure" level="style" name="placepagenumber"/>
  </cd:interface>
  <cd:interface file="i-pageselection.xml">
-  <cd:command file="page-sel.mkvi" level="document" name="insertpages">
+  <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="insertpages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -28887,7 +29068,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-sel.mkvi" level="document" name="filterpages">
+  <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="filterpages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -28911,7 +29092,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-sel.mkvi" level="document" name="copypages">
+  <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="copypages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -28933,7 +29114,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-sel.mkvi" level="document" name="combinepages">
+  <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="combinepages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -29000,7 +29181,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-sel.mkvi" level="document" name="slicepages">
+  <cd:command category="graphics" file="page-sel.mkvi" keywords="structure" level="document" name="slicepages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -29049,7 +29230,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pageshift.xml">
-  <cd:command file="page-imp.mkiv" level="style" name="definepageshift">
+  <cd:command category="layout" file="page-imp.mkiv" level="style" name="definepageshift">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29063,7 +29244,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-imp.mkiv" level="style" name="setuppageshift">
+  <cd:command category="layout" file="page-imp.mkiv" level="style" name="setuppageshift">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant default="yes" type="page"/>
@@ -29079,8 +29260,8 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagestate.xml">
-  <cd:command file="spac-pag.mkiv" level="system" name="signalrightpage"/>
-  <cd:command file="spac-pag.mkiv" level="system" name="doifelserightpage">
+  <cd:command category="twopassdata" file="spac-pag.mkiv" level="system" name="signalrightpage"/>
+  <cd:command category="twopassdata" file="spac-pag.mkiv" keywords="conditional" level="system" name="doifelserightpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -29090,7 +29271,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-pag.mkiv" level="system" name="doifrightpageelse">
+  <cd:command category="twopassdata" file="spac-pag.mkiv" keywords="conditional" level="system" name="doifrightpageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -29100,8 +29281,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-pag.mkiv" level="system" name="rightpageorder"/>
-  <cd:command file="core-dat.mkiv" level="system" name="definepagestate">
+  <cd:command category="twopassdata" file="spac-pag.mkiv" level="system" name="rightpageorder"/>
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="definepagestate">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29114,7 +29295,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="setuppagestate">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setuppagestate">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -29127,7 +29308,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="setpagestate">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setpagestate">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29138,7 +29319,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpage">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="pagestaterealpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29149,7 +29330,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="setpagestaterealpageno">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setpagestaterealpageno">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29160,7 +29341,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpageorder">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="pagestaterealpageorder">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29171,21 +29352,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpage">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="autopagestaterealpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="setautopagestaterealpageno">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="setautopagestaterealpageno">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-dat.mkiv" level="system" name="autopagestaterealpageorder">
+  <cd:command category="twopassdata" file="core-dat.mkiv" keywords="counter pagenumber" level="system" name="autopagestaterealpageorder">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29194,7 +29375,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pagemarks.xml">
-  <cd:command file="page-ini.mkiv" level="style" name="markpage">
+  <cd:command category="structure" file="page-ini.mkiv" level="style" name="markpage">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29204,21 +29385,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-ini.mkiv" level="style" name="markedpages">
+  <cd:command category="structure" file="page-ini.mkiv" level="style" name="markedpages">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-ini.mkiv" level="style" name="markpages" type="environment">
+  <cd:command category="structure" file="page-ini.mkiv" level="style" name="markpages" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="page-ini.mkiv" level="style" name="doifelsemarkedpage">
+  <cd:command category="structure" file="page-ini.mkiv" keywords="conditional" level="style" name="doifelsemarkedpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29233,7 +29414,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-pairedbox.xml">
-  <cd:command file="pack-com.mkiv" level="style" name="definepairedbox">
+  <cd:command category="tables" file="pack-com.mkiv" level="style" name="definepairedbox">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29246,7 +29427,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-com.mkiv" level="style" name="setuppairedbox">
+  <cd:command category="tables" file="pack-com.mkiv" level="style" name="setuppairedbox">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -29304,7 +29485,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-com.mkiv" level="document" name="placepairedbox">
+  <cd:command category="tables" file="pack-com.mkiv" level="document" name="placepairedbox">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29318,7 +29499,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-com.mkiv" level="document" name="placepairedbox" type="environment">
+  <cd:command category="tables" file="pack-com.mkiv" level="document" name="placepairedbox" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29328,7 +29509,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance">
+  <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance">
    <cd:sequence>
     <cd:string value="setup"/>
     <cd:instance value="pairedbox"/>
@@ -29342,7 +29523,7 @@
     <cd:constant value="legend"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance">
+  <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance">
    <cd:sequence>
     <cd:string value="place"/>
     <cd:instance value="pairedbox"/>
@@ -29360,7 +29541,7 @@
     <cd:constant value="legend"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance">
+  <cd:command category="tables" file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance">
    <cd:sequence>
     <cd:string value="place"/>
     <cd:instance value="pairedbox"/>
@@ -29374,13 +29555,13 @@
     <cd:constant value="legend"/>
    </cd:instances>
   </cd:command>
-  <cd:command file="pack-com.mkiv" level="document" name="placeontopofeachother">
+  <cd:command category="tables" file="pack-com.mkiv" level="document" name="placeontopofeachother">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-com.mkiv" level="document" name="placesidebyside">
+  <cd:command category="tables" file="pack-com.mkiv" level="document" name="placesidebyside">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -29638,7 +29819,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-paragraphnumber.xml">
-  <cd:command category="structure counter" file="page-par.mkiv" level="style" name="setupparagraphnumbering">
+  <cd:command category="structure" file="page-par.mkiv" keywords="counter" level="style" name="setupparagraphnumbering">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="state">
@@ -29827,7 +30008,7 @@
   <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="paragraphscell" type="environment"/>
  </cd:interface>
  <cd:interface file="i-parallel.xml">
-  <cd:command file="buff-par.mkvi" level="style" name="defineparallel">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="defineparallel">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29837,7 +30018,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="buff-par.mkvi" level="style" name="setupparallel">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="setupparallel">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29861,7 +30042,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="buff-par.mkvi" level="document" name="placeparallel">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="document" name="placeparallel">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29874,7 +30055,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifelseparallel">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure conditional" level="style" name="doifelseparallel">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29891,7 +30072,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifparallelelse">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure conditional" level="style" name="doifparallelelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -29908,7 +30089,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="buff-par.mkvi" level="style" name="resetparallel">
+  <cd:command category="columns" file="buff-par.mkvi" keywords="structure" level="style" name="resetparallel">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -29919,7 +30100,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="buff-par.mkvi" generated="yes" level="document" name="parallel" type="environment" variant="example">
+  <cd:command category="columns" file="buff-par.mkvi" generated="yes" keywords="structure" level="document" name="parallel" type="environment" variant="example">
    <cd:sequence>
     <cd:variable value="parallel"/>
    </cd:sequence>
@@ -30172,22 +30353,22 @@
   <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="unknown"/>
  </cd:interface>
  <cd:interface file="i-phantom.xml">
-  <cd:command file="supp-box.mkiv" level="style" name="phantom">
+  <cd:command category="strings" file="supp-box.mkiv" level="style" name="phantom">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="style" name="hphantom">
+  <cd:command category="strings" file="supp-box.mkiv" level="style" name="hphantom">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="style" name="vphantom">
+  <cd:command category="strings" file="supp-box.mkiv" level="style" name="vphantom">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="pack-box.mkiv" level="style" name="phantombox">
+  <cd:command category="boxes" file="pack-box.mkiv" keywords="strings" level="style" name="phantombox">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="width">
@@ -30203,6 +30384,53 @@
    </cd:arguments>
   </cd:command>
  </cd:interface>
+ <cd:interface file="i-placeholder.xml">
+  <cd:command category="structure" file="typo-plc.mkiv" level="style" name="defineplaceholder">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupplaceholder"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="structure" file="typo-plc.mkiv" level="style" name="setupplaceholder">
+   <cd:arguments>
+    <cd:keywords list="yes" optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes">
+     <cd:parameter name="before">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="after">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="text">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
+     <cd:parameter name="style">
+      <cd:constant type="cd:style"/>
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="color">
+      <cd:constant type="cd:color"/>
+     </cd:parameter>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="structure" file="typo-plc.mkiv" level="document" name="placeholder">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+ </cd:interface>
  <cd:interface file="i-placement.xml">
   <cd:command category="layout" file="pack-mis.mkiv" level="style" name="defineplacement">
    <cd:arguments>
@@ -30278,7 +30506,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-position.xml">
-  <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionaction">
+  <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifpositionaction">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30291,7 +30519,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifelsepositionaction">
+  <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifelsepositionaction">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30304,7 +30532,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionactionelse">
+  <cd:command file="anch-pgr.mkiv" keywords="conditional" level="system" name="doifpositionactionelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30331,7 +30559,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPoverlayanchor">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPoverlayanchor">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30355,7 +30583,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic" type="environment">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositiongraphic" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30365,7 +30593,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositiongraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30377,14 +30605,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositionmethod" type="environment">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPpositionmethod" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphic">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="setMPpositiongraphic">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30399,7 +30627,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphicrange">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="setMPpositiongraphicrange">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30417,7 +30645,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetposboxes">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetposboxes">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -30427,7 +30655,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultipars">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetmultipars">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30437,7 +30665,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultishape">
+  <cd:command category="background" file="anch-pgr.mkiv" keywords="metapost" level="system" name="MPgetmultishape">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30761,7 +30989,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifposition">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifposition">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30774,7 +31002,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseposition">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelseposition">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30787,7 +31015,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30800,7 +31028,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositiononpage">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositiononpage">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30816,7 +31044,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositiononpageelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositiononpageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30872,7 +31100,7 @@
   <cd:command file="anch-pos.mkiv" level="system" name="tracepositions"/>
   <cd:command file="anch-pos.mkiv" level="system" name="enableparpositions"/>
   <cd:command file="anch-pos.mkiv" level="system" name="disableparpositions"/>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseoverlapping">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelseoverlapping">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30888,7 +31116,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifoverlappingelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifoverlappingelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -30904,7 +31132,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsonsamepage">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -30917,7 +31145,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsonsamepageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -30930,7 +31158,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsonthispage">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -30943,7 +31171,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsonthispageelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -30956,7 +31184,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsused">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifelsepositionsused">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -30966,7 +31194,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsusedelse">
+  <cd:command file="anch-pos.mkiv" keywords="conditional" level="system" name="doifpositionsusedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -31148,7 +31376,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-processor.xml">
-  <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="defineprocessor">
+  <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="style" name="defineprocessor">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -31161,7 +31389,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="setupprocessor">
+  <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="style" name="setupprocessor">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -31190,7 +31418,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts colors" file="typo-prc.mkvi" level="system" name="applyprocessor">
+  <cd:command category="fonts" file="typo-prc.mkvi" keywords="colors" level="system" name="applyprocessor">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -33453,7 +33681,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelse">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="address"/>
@@ -33496,7 +33724,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoif">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoif">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="address"/>
@@ -33536,7 +33764,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifnot">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifnot">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="address"/>
@@ -33583,7 +33811,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameaspreviouschecked">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsesameaspreviouschecked">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="always"/>
@@ -33630,7 +33858,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameasprevious">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsesameasprevious">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="address"/>
@@ -33673,7 +33901,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsecombiinlist">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelsecombiinlist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -33689,7 +33917,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouscheckedelse">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifsameaspreviouscheckedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="always"/>
@@ -33736,7 +33964,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouselse">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifsameaspreviouselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="address"/>
@@ -33779,7 +34007,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifcombiinlistelse">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifcombiinlistelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -33802,7 +34030,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelseuservariable">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifelseuservariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -33815,7 +34043,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifuservariableelse">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxdoifuservariableelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -33894,7 +34122,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularplural">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxsingularplural">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="editor"/>
@@ -33909,7 +34137,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularorplural">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxsingularorplural">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="editor"/>
@@ -33924,7 +34152,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxoneorrange">
+  <cd:command category="bibliography" file="publ-ini.mkiv" keywords="conditional" level="system" name="btxoneorrange">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="volume"/>
@@ -34175,7 +34403,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-random.xml">
-  <cd:command file="supp-ran.mkiv" level="system" name="getrandomcount">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomcount">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -34186,7 +34414,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="getrandomdimen">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomdimen">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -34197,7 +34425,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="getrandomnumber">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomnumber">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -34208,7 +34436,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="getrandomfloat">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomfloat">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -34219,21 +34447,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="setrandomseed">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="setrandomseed">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="getrandomseed">
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="getrandomseed">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command begin="push" end="pop" file="supp-ran.mkiv" level="system" name="randomseed" type="environment"/>
-  <cd:command file="supp-ran.mkiv" level="system" name="reuserandomseed"/>
-  <cd:command file="supp-ran.mkiv" level="system" name="randomnumber">
+  <cd:command begin="push" category="counter" end="pop" file="supp-ran.mkiv" level="system" name="randomseed" type="environment"/>
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="reuserandomseed"/>
+  <cd:command category="counter" file="supp-ran.mkiv" level="system" name="randomnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -34243,7 +34471,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-ran.mkiv" level="system" name="mprandomnumber"/>
+  <cd:command category="counter" file="supp-ran.mkiv" keywords="metapost" level="system" name="mprandomnumber"/>
  </cd:interface>
  <cd:interface file="i-references.xml">
   <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencing">
@@ -34430,7 +34658,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsereferencefound">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelsereferencefound">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:reference"/>
@@ -34443,7 +34671,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifreferencefoundelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:reference"/>
@@ -34822,7 +35050,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelseurldefined">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelseurldefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -34835,7 +35063,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifurldefinedelse">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifurldefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -34848,7 +35076,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsefiledefined">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doifelsefiledefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -34861,7 +35089,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse">
+  <cd:command category="references" file="strc-ref.mkvi" keywords="conditional" level="system" name="doiffiledefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -36744,7 +36972,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-ruby.xml">
-  <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="defineruby">
+  <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="style" name="defineruby">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -36757,7 +36985,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="setupruby">
+  <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="style" name="setupruby">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -36805,7 +37033,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby">
+  <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="document" name="ruby">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -36818,7 +37046,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby" type="environment">
+  <cd:command category="language" file="typo-rub.mkiv" keywords="fonts" level="document" name="ruby" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -36980,6 +37208,7 @@
       <cd:constant type="nihongo"/>
       <cd:constant type="ethiopic"/>
       <cd:constant type="thai"/>
+      <cd:constant type="tibetan"/>
       <cd:constant type="test"/>
      </cd:parameter>
      <cd:parameter name="preset">
@@ -37041,7 +37270,7 @@
    </cd:arguments>
   </cd:command>
   <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/>
-  <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment">
+  <cd:command category="language" file="scrp-ini.mkvi" level="document" name="script" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="hangul"/>
@@ -37049,6 +37278,7 @@
      <cd:constant type="nihongo"/>
      <cd:constant type="ethiopic"/>
      <cd:constant type="thai"/>
+     <cd:constant type="tibetan"/>
      <cd:constant type="test"/>
      <cd:constant type="cd:name"/>
     </cd:keywords>
@@ -37479,6 +37709,9 @@
      <cd:parameter name="ownnumber">
       <cd:constant type="cd:text"/>
      </cd:parameter>
+     <cd:parameter name="placeholder">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
    <cd:instances>
@@ -37521,6 +37754,9 @@
      <cd:parameter name="ownnumber">
       <cd:constant type="cd:text"/>
      </cd:parameter>
+     <cd:parameter name="placeholder">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
     </cd:assignments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="cd:key">
@@ -37568,6 +37804,9 @@
      <cd:parameter name="ownnumber">
       <cd:constant type="cd:text"/>
      </cd:parameter>
+     <cd:parameter name="placeholder">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
     </cd:assignments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="cd:key">
@@ -37769,6 +38008,9 @@
      <cd:parameter name="ownnumber">
       <cd:constant type="cd:text"/>
      </cd:parameter>
+     <cd:parameter name="placeholder">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
     </cd:assignments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="cd:key">
@@ -37801,6 +38043,9 @@
      <cd:parameter name="ownnumber">
       <cd:constant type="cd:text"/>
      </cd:parameter>
+     <cd:parameter name="placeholder">
+      <cd:constant type="cd:text"/>
+     </cd:parameter>
     </cd:assignments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="cd:key">
@@ -37955,7 +38200,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-selector.xml">
-  <cd:command file="core-env.mkiv" level="style" name="defineselector">
+  <cd:command category="strings" file="core-env.mkiv" level="style" name="defineselector">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -37965,7 +38210,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setupselector">
+  <cd:command category="strings" file="core-env.mkiv" level="style" name="setupselector">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -37974,13 +38219,13 @@
      <cd:parameter name="n">
       <cd:constant type="cd:number"/>
      </cd:parameter>
-     <cd:parameter name="m">
+     <cd:parameter name="max">
       <cd:constant type="cd:number"/>
      </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="document" name="select">
+  <cd:command category="strings" file="core-env.mkiv" level="document" name="select">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -37992,7 +38237,7 @@
     <cd:content optional="yes"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="directselect">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="directselect">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38006,77 +38251,77 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-setups.xml">
-  <cd:command file="core-env.mkiv" level="style" name="setups">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setups">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setups" variant="direct">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" variant="direct">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setup">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setup">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setup" variant="direct">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setup" variant="direct">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="directsetup">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="directsetup">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="fastsetup">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="fastsetup">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="texsetup">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="texsetup">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="lua" file="core-env.mkiv" level="style" name="luasetup">
+  <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="style" name="luasetup">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="systemsetups">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="systemsetups">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="resetsetups">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="resetsetups">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="copysetups">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="copysetups">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -38086,14 +38331,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="showsetupsdefinition">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="showsetupsdefinition">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setupwithargument">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="setupwithargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38101,7 +38346,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargument">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="fastsetupwithargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38109,7 +38354,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setupwithargumentswapped">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="setupwithargumentswapped">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -38117,7 +38362,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -38125,26 +38370,26 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="usesetupsparameter">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="usesetupsparameter">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="autosetups">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="autosetups">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="doprocesslocalsetups">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="doprocesslocalsetups">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsesetups">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifelsesetups">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38157,7 +38402,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetupselse">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifsetupselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38170,7 +38415,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetups">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifsetups">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38180,7 +38425,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotsetups">
+  <cd:command category="structure" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotsetups">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -38190,7 +38435,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment">
+  <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="system" name="luasetups" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="grid"/>
@@ -38200,14 +38445,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment" variant="string">
+  <cd:command category="structure" file="core-env.mkiv" keywords="lua" level="system" name="luasetups" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment">
+  <cd:command category="structure" file="core-env.mkiv" keywords="xml" level="style" name="xmlsetups" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="grid"/>
@@ -38217,14 +38462,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment" variant="string">
+  <cd:command category="structure" file="core-env.mkiv" keywords="xml" level="style" name="xmlsetups" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="rawsetups" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="grid"/>
@@ -38234,14 +38479,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment" variant="string">
+  <cd:command category="structure" file="core-env.mkiv" level="system" name="rawsetups" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="localsetups" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="grid"/>
@@ -38251,14 +38496,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment" variant="string">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="localsetups" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setups" type="environment">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="grid"/>
@@ -38268,7 +38513,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setups" type="environment" variant="string">
+  <cd:command category="structure" file="core-env.mkiv" level="style" name="setups" type="environment" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
@@ -38446,7 +38691,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-simplecolumns.xml">
-  <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="setsimplecolumnshsize">
+  <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="system" name="setsimplecolumnshsize">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="n">
@@ -38464,7 +38709,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="simplecolumns" type="environment">
+  <cd:command category="columns" file="page-smp.mkiv" keywords="structure layout" level="system" name="simplecolumns" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:parameter name="n">
@@ -38484,7 +38729,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-smash.xml">
-  <cd:command file="supp-box.mkiv" level="system" name="smashbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -38492,7 +38737,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="smashboxed">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashboxed">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -38500,7 +38745,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hsmashbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmashbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -38508,7 +38753,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vsmashbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmashbox">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:csname"/>
@@ -38516,27 +38761,27 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hsmash">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmash">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vsmash">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmash">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="hsmashed">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="hsmashed">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="vsmashed">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="vsmashed">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="smashedhbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashedhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -38544,7 +38789,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="system" name="smashedvbox">
+  <cd:command category="boxes" file="supp-box.mkiv" level="system" name="smashedvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -38552,7 +38797,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="supp-box.mkiv" level="document" name="smash">
+  <cd:command category="boxes" file="supp-box.mkiv" level="document" name="smash">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="w"/>
@@ -38731,7 +38976,7 @@
     <cd:constant value="logos"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="language conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused">
+  <cd:command category="language" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsortingused">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -38813,7 +39058,7 @@
     <cd:assignments list="yes">
      <cd:parameter name="state">
       <cd:constant type="start"/>
-      <cd:constant defult="yes" type="stop"/>
+      <cd:constant default="yes" type="stop"/>
      </cd:parameter>
      <cd:parameter name="method">
       <cd:constant type="1"/>
@@ -38907,8 +39152,8 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-stream.xml">
-  <cd:command file="page-str.mkiv" level="system" name="currentoutputstream"/>
-  <cd:command file="page-str.mkiv" level="system" name="ifinoutputstream">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="currentoutputstream"/>
+  <cd:command category="structure" file="page-str.mkiv" keywords="conditional" level="system" name="ifinoutputstream">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:true"/>
@@ -38920,64 +39165,64 @@
     <cd:delimiter name="fi"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="enableoutputstream">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="enableoutputstream">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="disableoutputstream"/>
-  <cd:command file="page-str.mkiv" level="system" name="outputstream" type="environment">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="disableoutputstream"/>
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="outputstream" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="flushoutputstream">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="flushoutputstream">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="outputstreambox">
+  <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreambox">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="outputstreamcopy">
+  <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamcopy">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="outputstreamunvbox">
+  <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamunvbox">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="outputstreamunvcopy">
+  <cd:command category="structure" file="page-str.mkiv" keywords="boxes" level="system" name="outputstreamunvcopy">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="synchronizeoutputstreams">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="synchronizeoutputstreams">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="page-str.mkiv" level="system" name="pushoutputstream">
+  <cd:command category="structure" file="page-str.mkiv" level="system" name="pushoutputstream">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -38986,70 +39231,70 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-string.xml">
-  <cd:command file="blob-ini.mkiv" level="system" name="wdofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="wdofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="htofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="htofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="dpofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="dpofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="hdofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="hdofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="htdpofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="htdpofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="widthofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="widthofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="heightofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="heightofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="depthofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="depthofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="heightanddepthofstring">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="heightanddepthofstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="blob-ini.mkiv" level="system" name="setwidthof">
+  <cd:command category="strings" file="blob-ini.mkiv" level="system" name="setwidthof">
    <cd:arguments>
     <cd:text/>
     <cd:delimiter name="to"/>
@@ -39058,12 +39303,12 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-strut.xml">
-  <cd:command file="supp-box.mkiv" level="system" name="strutdp"/>
-  <cd:command file="supp-box.mkiv" level="system" name="strutht"/>
-  <cd:command file="supp-box.mkiv" level="system" name="strutwd"/>
-  <cd:command file="supp-box.mkiv" level="system" name="struthtdp"/>
-  <cd:command file="supp-box.mkiv" level="system" name="strutgap"/>
-  <cd:command file="spac-ver.mkiv" level="style" name="setupstrut">
+  <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutdp"/>
+  <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutht"/>
+  <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutwd"/>
+  <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="struthtdp"/>
+  <cd:command category="fonts" file="supp-box.mkiv" keywords="whitespace" level="system" name="strutgap"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="style" name="setupstrut">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="yes"/>
@@ -39077,7 +39322,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ver.mkiv" level="system" name="synchronizestrut">
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="synchronizestrut">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -39091,27 +39336,27 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ver.mkiv" level="style" name="strut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="halfstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="quarterstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="halflinestrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="noheightstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="depthstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="setstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="setcharstrut">
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="style" name="strut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="halfstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="quarterstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="halflinestrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="noheightstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="depthstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setcharstrut">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="spac-ver.mkiv" level="system" name="setfontstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="settightstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="setcapstrut"/>
-  <cd:command file="spac-ver.mkiv" level="system" name="setnostrut"/>
-  <cd:command file="spac-ver.mkiv" level="document" name="showstruts"/>
-  <cd:command file="spac-ver.mkiv" level="document" name="showcolorstruts"/>
-  <cd:command begin="beg" end="end" file="spac-ver.mkiv" level="system" name="strut" type="environment"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setfontstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="settightstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setcapstrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="system" name="setnostrut"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="document" name="showstruts"/>
+  <cd:command category="fonts" file="spac-ver.mkiv" keywords="whitespace" level="document" name="showcolorstruts"/>
+  <cd:command begin="beg" category="fonts" end="end" file="spac-ver.mkiv" keywords="whitespace" level="system" name="strut" type="environment"/>
  </cd:interface>
  <cd:interface file="i-symbol.xml">
   <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definesymbol">
@@ -39127,7 +39372,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelseinsymbolset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39143,7 +39388,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifinsymbolsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39159,7 +39404,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolset">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifinsymbolset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39175,7 +39420,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymbolset">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelsesymbolset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39188,7 +39433,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifsymbolsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39228,7 +39473,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols graphics" file="symb-ini.mkiv" level="style" name="definefiguresymbol">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="graphics" level="style" name="definefiguresymbol">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -39242,7 +39487,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols graphics" file="symb-ini.mkiv" level="document" name="figuresymbol">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="graphics" level="document" name="figuresymbol">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:file"/>
@@ -39253,7 +39498,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifelsesymboldefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39266,7 +39511,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse">
+  <cd:command category="symbols" file="symb-ini.mkiv" keywords="conditional" level="system" name="doifsymboldefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39555,7 +39800,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused">
+  <cd:command category="symbols" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsynonymused">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39565,7 +39810,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown">
+  <cd:command category="symbols" file="strc-syn.mkiv" keywords="conditional" level="system" name="doifelsecurrentsynonymshown">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39618,31 +39863,31 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-system.xml">
-  <cd:command file="syst-aux.mkiv" level="system" name="expanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="expanded">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="expanded" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="expanded" type="environment"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleoneargument">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbletwoarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletwoarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblethreearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblethreearguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblefourarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefourarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39650,7 +39895,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblefivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefivearguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39659,7 +39904,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblesixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesixarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39669,7 +39914,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblesevenarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesevenarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39680,7 +39925,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleeightarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleeightarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39692,7 +39937,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleninearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleninearguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39705,7 +39950,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbletenarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletenarguments">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -39719,14 +39964,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneoptional">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleoneoptional">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbletwooptionals">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbletwooptionals">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -39736,7 +39981,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblethreeoptionals">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblethreeoptionals">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -39749,7 +39994,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblefouroptionals">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefouroptionals">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -39765,7 +40010,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblefiveoptionals">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblefiveoptionals">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -39784,8 +40029,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="donothing"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextchar">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="donothing"/>
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -39798,7 +40043,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextcharelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextcharelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -39811,7 +40056,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptional">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextoptional">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39821,7 +40066,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextoptionalelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39831,19 +40076,19 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptionalcs">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextoptionalcs">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalcselse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextoptionalcselse">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroup">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextbgroup">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39853,7 +40098,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextbgroupelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39863,19 +40108,19 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroupcs">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextbgroupcs">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupcselse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextbgroupcselse">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextparenthesis">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenextparenthesis">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39885,7 +40130,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnextparenthesiselse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnextparenthesiselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39895,7 +40140,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheck">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefastoptionalcheck">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39905,7 +40150,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffastoptionalcheckelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -39915,25 +40160,25 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheckcs">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefastoptionalcheckcs">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckcselse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffastoptionalcheckcselse">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="assumelongusagecs">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="assumelongusagecs">
    <cd:arguments>
     <cd:csname/>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39941,7 +40186,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setgvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setgvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39949,7 +40194,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setevalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setevalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39957,7 +40202,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setxvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setxvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39965,14 +40210,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39980,7 +40225,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letgvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -39988,28 +40233,28 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="resetvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="undefinevalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="undefinevalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ignorevalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="ignorevalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setuvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40017,7 +40262,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setuevalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuevalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40025,7 +40270,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setugvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setugvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40033,7 +40278,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setuxvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setuxvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40041,14 +40286,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getuvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getuvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseundefined">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseundefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40061,7 +40306,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifundefinedelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifundefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40074,7 +40319,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsedefined">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40087,7 +40332,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifdefinedelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40100,7 +40345,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifundefined">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifundefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40110,7 +40355,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifdefined">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -40120,28 +40365,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letbeundefined">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letbeundefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="localundefine">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="localundefine">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalundefine">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalundefine">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsealldefined">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsealldefined">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -40154,7 +40399,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifalldefinedelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifalldefinedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:name"/>
@@ -40167,7 +40412,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doif">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doif">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -40176,7 +40421,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnot">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnot">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -40185,7 +40430,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelse">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -40197,7 +40442,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseempty">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseempty">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -40208,7 +40453,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifemptyelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyelse">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -40219,7 +40464,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifempty">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifempty">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -40227,7 +40472,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotempty">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotempty">
    <cd:arguments>
     <cd:content/>
     <cd:keywords delimiters="braces">
@@ -40235,7 +40480,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40251,7 +40496,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifinsetelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40267,7 +40512,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40280,7 +40525,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40293,7 +40538,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsecommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsecommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -40309,7 +40554,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifcommonelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifcommonelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -40325,7 +40570,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifcommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifcommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -40338,7 +40583,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotcommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotcommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -40351,7 +40596,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcommalist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40359,9 +40604,9 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="quitcommalist"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="quitprevcommalist"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="quitcommalist"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="quitprevcommalist"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommacommand">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40369,7 +40614,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcommalistwithparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalistwithparameters">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40377,22 +40622,22 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcommalist" type="environment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommalist" type="environment">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand" type="environment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processcommacommand" type="environment">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="currentcommalistitem"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="processaction">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentcommalistitem"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processaction">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:command"/>
@@ -40400,7 +40645,7 @@
     <cd:apply list="yes"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processfirstactioninset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processfirstactioninset">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:command"/>
@@ -40408,7 +40653,7 @@
     <cd:apply list="yes"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processallactionsinset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processallactionsinset">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:command"/>
@@ -40417,16 +40662,16 @@
    </cd:arguments>
   </cd:command>
   <cd:command file="syst-aux.mkiv" level="system" name="commalistelement"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstcharacter"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="remainingcharacters"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="getfirstcharacter">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="firstcharacter"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="remainingcharacters"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="getfirstcharacter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsefirstchar">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsefirstchar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40442,7 +40687,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doiffirstcharelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doiffirstcharelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40458,21 +40703,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thefirstcharacter">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="thefirstcharacter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="theremainingcharacters">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="theremainingcharacters">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseinstring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseinstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40488,7 +40733,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifinstringelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinstringelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40504,7 +40749,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifinstring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifinstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40517,7 +40762,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotinstring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotinstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40530,7 +40775,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseincsname">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseincsname">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40546,7 +40791,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifincsnameelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifincsnameelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40562,7 +40807,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenumber">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40575,7 +40820,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnumberelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnumberelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40588,7 +40833,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnumber">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40598,7 +40843,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotnumber">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotnumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40608,7 +40853,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="percentdimen">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="percentdimen">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -40620,7 +40865,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setpercentdimen">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setpercentdimen">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -40632,7 +40877,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="makerawcommalist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="makerawcommalist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40640,7 +40885,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommalist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocesscommalist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40648,7 +40893,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommacommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocesscommacommand">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40656,7 +40901,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawdoifelseinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifelseinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40672,7 +40917,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinsetelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifinsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40688,7 +40933,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="rawdoifinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -40701,7 +40946,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawprocessaction">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawprocessaction">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:command"/>
@@ -40709,8 +40954,8 @@
     <cd:apply list="yes"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="currentvalue"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="getparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentvalue"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40722,7 +40967,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="geteparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="geteparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40734,7 +40979,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getgparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getgparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40746,7 +40991,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getxparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getxparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40758,7 +41003,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="forgetparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="forgetparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40770,7 +41015,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getexpandedparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getexpandedparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40782,7 +41027,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doassign">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doassign">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40794,7 +41039,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doeassign">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doeassign">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40806,7 +41051,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="undoassign">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="undoassign">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40818,7 +41063,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doassignempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doassignempty">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40830,7 +41075,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentlist">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="cd:key">
@@ -40840,7 +41085,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentcommand">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="cd:key">
@@ -40850,7 +41095,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="cd:key">
@@ -40859,7 +41104,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="cd:key">
@@ -40868,9 +41113,9 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistkey"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistvalue"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="getemptyparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentassignmentlistkey"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentassignmentlistvalue"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getemptyparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40882,7 +41127,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="copyparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="copyparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -40895,14 +41140,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="checkparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="checkparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ifparameters">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="ifparameters">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:true"/>
@@ -40914,22 +41159,22 @@
     <cd:delimiter name="fi"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="commalistsize"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="getcommalistsize">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="commalistsize"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getcommalistsize">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getcommacommandsize">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getcommacommandsize">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getfromcommalist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getfromcommalist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40939,7 +41184,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getfromcommacommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getfromcommacommand">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
@@ -40949,14 +41194,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstinlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstinlist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dogetcommacommandelement">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogetcommacommandelement">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:number"/>
@@ -40969,7 +41214,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dosingleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosingleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -40977,7 +41222,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dodoubleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -40988,7 +41233,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotripleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -41002,7 +41247,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadrupleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -41019,7 +41264,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquintupleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintupleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -41039,7 +41284,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosixtupleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -41062,7 +41307,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doseventupleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doseventupleempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords optional="yes">
@@ -41088,7 +41333,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dosingleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosingleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41096,7 +41341,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41107,7 +41352,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotripleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41121,7 +41366,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadrupleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41138,7 +41383,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquintupleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintupleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41158,7 +41403,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosixtupleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41181,7 +41426,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doseventupleargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doseventupleargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords>
@@ -41207,24 +41452,24 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="strippedcsname">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname" variant="string">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="strippedcsname" variant="string">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimple">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41232,12 +41477,12 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimpleempty">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41245,12 +41490,12 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimple">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41258,12 +41503,12 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41271,9 +41516,9 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="permitspacesbetweengroups"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="dontpermitspacesbetweengroups"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="dosinglegroupempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="permitspacesbetweengroups"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dontpermitspacesbetweengroups"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dosinglegroupempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces" optional="yes">
@@ -41281,7 +41526,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dodoublegroupempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoublegroupempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces" optional="yes">
@@ -41292,7 +41537,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotriplegroupempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotriplegroupempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces" optional="yes">
@@ -41306,7 +41551,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquadruplegroupempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquadruplegroupempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces" optional="yes">
@@ -41323,7 +41568,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doquintuplegroupempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doquintuplegroupempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces" optional="yes">
@@ -41343,14 +41588,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstofoneargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofoneargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstoftwoarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoftwoarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41360,7 +41605,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondoftwoarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoftwoarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41370,7 +41615,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstofthreearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofthreearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41383,7 +41628,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondofthreearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofthreearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41396,7 +41641,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofthreearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41409,7 +41654,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstoffourarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoffourarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41425,7 +41670,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondoffourarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoffourarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41441,7 +41686,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thirdoffourarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdoffourarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41457,7 +41702,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fourthoffourarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthoffourarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41473,7 +41718,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstoffivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoffivearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41492,7 +41737,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondoffivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoffivearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41511,7 +41756,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thirdoffivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdoffivearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41530,7 +41775,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fourthoffivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthoffivearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41549,7 +41794,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fifthoffivearguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fifthoffivearguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41568,7 +41813,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41590,7 +41835,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41612,7 +41857,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thirdofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41634,7 +41879,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fourthofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fourthofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41656,7 +41901,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fifthofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fifthofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41678,7 +41923,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="sixthofsixarguments">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="sixthofsixarguments">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41700,14 +41945,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstofoneunexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofoneunexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstoftwounexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstoftwounexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41717,7 +41962,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondoftwounexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondoftwounexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41727,7 +41972,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41740,7 +41985,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41753,7 +41998,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -41766,52 +42011,52 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letempty">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalletempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalletempty">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letvalueempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvalueempty">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letgvalueempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalueempty">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letvaluerelax">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letvaluerelax">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letgvalurelax">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letgvalurelax">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="relaxvalueifundefined">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="relaxvalueifundefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="rawgetparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="rawgetparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -41823,7 +42068,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="texdefinition" type="environment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="texdefinition" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="spaces"/>
@@ -41860,35 +42105,35 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="texdefinition">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="texdefinition">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="texcode" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="newcounter">
+  <cd:command category="catcode" file="syst-aux.mkiv" level="system" name="texcode" type="environment"/>
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="newcounter">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fastincrement">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="fastincrement">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fastdecrement">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="fastdecrement">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="increment">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="increment">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="increment" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="parenthesis" list="yes">
      <cd:constant type="cd:csname"/>
@@ -41896,12 +42141,12 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="decrement">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrement">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrement" variant="argument">
    <cd:arguments>
     <cd:keywords delimiters="parenthesis" list="yes">
      <cd:constant type="cd:csname"/>
@@ -41909,46 +42154,39 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="incrementvalue">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="incrementvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="decrementvalue">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="decrementvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="newsignal">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="newsignal">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="checkedstrippedcsname">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname" variant="string">
-   <cd:arguments>
-    <cd:keywords delimiters="none">
-     <cd:constant type="cd:text"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="savenormalmeaning">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="savenormalmeaning">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="recursedepth"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="recurselevel"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="resetrecurselevel"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="dostepwiserecurse">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="recursedepth"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="recurselevel"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetrecurselevel"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dostepwiserecurse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -41964,7 +42202,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dorecurse">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dorecurse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -41974,7 +42212,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doexpandedrecurse">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doexpandedrecurse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -41984,7 +42222,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dowith">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowith">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:command"/>
@@ -41994,16 +42232,16 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doloop">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doloop">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="exitloop"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="exitloopnow"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="dofastloopcs">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="exitloop"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="exitloopnow"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dofastloopcs">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -42011,9 +42249,9 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="fastloopindex"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="fastloopfinal"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="doloopoverlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fastloopindex"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="fastloopfinal"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="doloopoverlist">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -42023,29 +42261,29 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="recursestring"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="newevery">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="recursestring"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="newevery">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="EveryPar">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="EveryPar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="EveryLine">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="EveryLine">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="forgeteverypar"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="convertvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="forgeteverypar"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertvalue">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:name"/>
@@ -42054,7 +42292,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="defconvertedvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedvalue">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42062,7 +42300,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignment">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseassignment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42075,7 +42313,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifassignmentelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42088,14 +42326,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="docheckassignment">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="docheckassignment">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ifassignment">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="ifassignment">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:true"/>
@@ -42107,7 +42345,7 @@
     <cd:delimiter name="fi"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignmentcs">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseassignmentcs">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42116,7 +42354,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelsecs">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifassignmentelsecs">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42125,7 +42363,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="convertargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertargument">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42134,14 +42372,14 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="convertcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="convertcommand">
    <cd:arguments>
     <cd:csname/>
     <cd:delimiter name="to"/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="defconvertedargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42149,13 +42387,13 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="defconvertedcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="defconvertedcommand">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="edefconvertedargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="edefconvertedargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42163,7 +42401,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gdefconvertedargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42171,13 +42409,13 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gdefconvertedcommand">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="xdefconvertedargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="xdefconvertedargument">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42185,14 +42423,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="showvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="showvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsemeaning">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsemeaning">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
@@ -42204,7 +42442,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifmeaningelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifmeaningelse">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
@@ -42216,7 +42454,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsesamestring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesamestring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42232,7 +42470,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsamestringelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsamestringelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42248,7 +42486,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsamestring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsamestring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42261,7 +42499,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotsamestring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotsamestring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42274,7 +42512,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ConvertToConstant">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="ConvertToConstant">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42285,7 +42523,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ConvertConstantAfter">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="ConvertConstantAfter">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42296,7 +42534,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="assignifempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="assignifempty">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42304,7 +42542,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="grabuntil">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="grabuntil">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -42312,7 +42550,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processbetween">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processbetween">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -42320,12 +42558,12 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntil">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleuntil">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntilrelax">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbleuntilrelax">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:content"/>
@@ -42333,12 +42571,12 @@
     <cd:delimiter name="relax"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processuntil">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processuntil">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="groupedcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="groupedcommand">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -42348,7 +42586,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="simplegroupedcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="simplegroupedcommand">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -42358,7 +42596,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="pickupgroupedcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="pickupgroupedcommand">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -42371,33 +42609,33 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="BeforePar">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="BeforePar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="AfterPar">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="AfterPar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="GetPar"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="GotoPar"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="dowithpargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="GetPar"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="GotoPar"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithpargument">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dowithwargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithwargument">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dorepeatwithcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dorepeatwithcommand">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -42406,7 +42644,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsestringinstring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsestringinstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42422,7 +42660,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifstringinstringelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifstringinstringelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42438,7 +42676,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendtoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtoks">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42447,7 +42685,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependtoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtoks">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42456,7 +42694,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendtoksonce">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtoksonce">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42465,7 +42703,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependtoksonce">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtoksonce">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42474,7 +42712,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseintoks">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseintoks">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -42490,7 +42728,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifintokselse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifintokselse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:command"/>
@@ -42506,20 +42744,20 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="collecting" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="collect" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="expandedcollect" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="collect">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collecting" type="environment"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collect" type="environment"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="expandedcollect" type="environment"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collect">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="collectexpanded">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="collectexpanded">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="removetoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removetoks">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42528,7 +42766,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendetoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendetoks">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42537,7 +42775,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependetoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependetoks">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:command"/>
@@ -42546,17 +42784,17 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="flushtoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="flushtoks">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotoks">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="dotoks">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="beforesplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="beforesplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42569,7 +42807,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="aftersplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="aftersplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42582,7 +42820,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42597,7 +42835,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="greedysplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="greedysplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42612,7 +42850,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="beforetestandsplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="beforetestandsplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42625,7 +42863,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="aftertestandsplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="aftertestandsplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42638,7 +42876,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="testandsplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="testandsplitstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42653,7 +42891,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitatperiod">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatperiod">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42662,7 +42900,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitatcomma">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcomma">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42671,7 +42909,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitatasterisk">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatasterisk">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42680,7 +42918,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitatcolon">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcolon">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42689,7 +42927,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitatcolons">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitatcolons">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42698,7 +42936,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="removesubstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removesubstring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -42711,7 +42949,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendtocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="appendtocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42719,7 +42957,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependtocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="prependtocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42727,7 +42965,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="addtocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="addtocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42735,7 +42973,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="pretocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="pretocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42743,7 +42981,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="robustdoifelseinset">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="robustdoifelseinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42759,7 +42997,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="robustdoifinsetelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="robustdoifinsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42775,7 +43013,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="robustaddtocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="robustaddtocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42783,7 +43021,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="robustpretocommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="robustpretocommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42791,7 +43029,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="xsplitstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="xsplitstring">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42799,7 +43037,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="removefromcommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="removefromcommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42807,7 +43045,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="substituteincommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="substituteincommalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -42818,7 +43056,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="replaceincommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="replaceincommalist">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -42826,7 +43064,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalprocesscommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="globalprocesscommalist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:command"/>
@@ -42834,21 +43072,21 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="withoutpt">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="withoutpt">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="PtToCm">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PtToCm">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dimensiontocount">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="dimensiontocount">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -42856,89 +43094,89 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="numberofpoints">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="numberofpoints">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="swapdimens">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapdimens">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="swapcounts">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapcounts">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="swapmacros">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="swapmacros">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalswapdimens">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapdimens">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalswapcounts">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapcounts">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalswapmacros">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalswapmacros">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalpushmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalpushmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="localpushmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="localpushmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="globalpopmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="globalpopmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="localpopmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="localpopmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="pushmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="pushmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="popmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="popmacro">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="localhsize"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="setlocalhsize">
+  <cd:command category="layout" file="syst-aux.mkiv" level="system" name="localhsize"/>
+  <cd:command category="layout" file="syst-aux.mkiv" level="system" name="setlocalhsize">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant method="none" prefix="cd:sign" type="cd:dimension"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="availablehsize"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="distributedhsize">
+  <cd:command category="layout" file="syst-aux.mkiv" level="system" name="availablehsize"/>
+  <cd:command category="layout" file="syst-aux.mkiv" level="system" name="distributedhsize">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -42951,7 +43189,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="hsizefraction">
+  <cd:command category="layout" file="syst-aux.mkiv" level="system" name="hsizefraction">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -42961,7 +43199,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="doifvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -42974,7 +43212,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -42987,7 +43225,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsevalue">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsevalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43003,7 +43241,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifvalueelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvalueelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43019,7 +43257,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnothing">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnothing">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43029,7 +43267,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsomething">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomething">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43039,7 +43277,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenothing">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenothing">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43052,7 +43290,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnothingelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnothingelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43065,7 +43303,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomething">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesomething">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43078,7 +43316,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsomethingelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomethingelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43091,7 +43329,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothing">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluenothing">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43101,7 +43339,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifvaluesomething">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluesomething">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43111,7 +43349,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsevaluenothing">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsevaluenothing">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43124,7 +43362,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothingelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifvaluenothingelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43137,7 +43375,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseemptyvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseemptyvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43150,7 +43388,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalueelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyvalueelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43163,7 +43401,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptyvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43173,7 +43411,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotemptyvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotemptyvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43183,7 +43421,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseallcommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseallcommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -43199,7 +43437,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifallcommonelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifallcommonelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -43215,7 +43453,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifallcommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifallcommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -43228,7 +43466,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotallcommon">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotallcommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -43241,7 +43479,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dodoubleemptywithset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleemptywithset">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords list="yes" optional="yes">
@@ -43252,7 +43490,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotripleemptywithset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleemptywithset">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords list="yes" optional="yes">
@@ -43266,7 +43504,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords list="yes">
@@ -43277,7 +43515,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dotripleargumentwithset">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dotripleargumentwithset">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords list="yes">
@@ -43291,7 +43529,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="stripcharacter">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="stripcharacter">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:character"/>
@@ -43304,7 +43542,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="stripspaces">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="stripspaces">
    <cd:arguments>
     <cd:delimiter name="from"/>
     <cd:keywords delimiters="none">
@@ -43314,7 +43552,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="unspacestring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspacestring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43323,7 +43561,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="executeifdefined">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="executeifdefined">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43333,7 +43571,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomespace">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesomespace">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43346,7 +43584,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsomespaceelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsomespaceelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43359,7 +43597,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processseparatedlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processseparatedlist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -43373,7 +43611,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processlist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:character"/>
@@ -43387,7 +43625,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processassignlist">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processassignlist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:text"/>
@@ -43395,7 +43633,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="untexargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="untexargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43404,7 +43642,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="untexcommand">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="untexcommand">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:csname"/>
@@ -43413,7 +43651,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="PointsToBigPoints">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToBigPoints">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43421,7 +43659,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43429,7 +43667,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43437,7 +43675,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43445,7 +43683,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="PointsToReal">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="PointsToReal">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43453,22 +43691,22 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="style" name="dontleavehmode"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="utfupper">
+  <cd:command category="system" file="syst-aux.mkiv" level="style" name="dontleavehmode"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="utfupper">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="utflower">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="utflower">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="uppercasestring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="uppercasestring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43477,7 +43715,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="lowercasestring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="lowercasestring">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43486,7 +43724,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="counttoken">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="counttoken">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43499,7 +43737,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="counttokens">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="counttokens">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43508,7 +43746,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="splitofftokens">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="splitofftokens">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43521,7 +43759,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="handletokens">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="handletokens">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43530,9 +43768,9 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="settrialtypesetting"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="resettrialtypesetting"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="iftrialtypesetting">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="settrialtypesetting"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="resettrialtypesetting"/>
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="iftrialtypesetting">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:true"/>
@@ -43544,35 +43782,35 @@
     <cd:delimiter name="fi"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="integerrounding">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="integerrounding">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="onedigitrounding">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="onedigitrounding">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="twodigitrounding">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="twodigitrounding">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="threedigitrounding">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="threedigitrounding">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processcontent">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="processcontent">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43580,14 +43818,14 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dogobblesingleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogobblesingleempty">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dogobbledoubleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dogobbledoubleempty">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:text"/>
@@ -43597,14 +43835,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblesingleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobblesingleempty">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobbledoubleempty">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="gobbledoubleempty">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:text"/>
@@ -43614,7 +43852,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsesometoks">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsesometoks">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -43625,7 +43863,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsometokselse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsometokselse">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -43636,7 +43874,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifsometoks">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifsometoks">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -43644,7 +43882,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifemptytoks">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifemptytoks">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -43652,8 +43890,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="strictdoifelsenextoptional">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/>
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="strictdoifelsenextoptional">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -43663,7 +43901,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="strictdoifnextoptionalelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="strictdoifnextoptionalelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:true"/>
@@ -43673,42 +43911,42 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="gobblespacetokens"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="verbatimstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="gobblespacetokens"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="verbatimstring">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="lastdigit">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="lastdigit">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="lasttwodigits">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="lasttwodigits">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="serializedcommalist"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="serializecommalist">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="serializedcommalist"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="serializecommalist">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:command"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="purenumber">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="purenumber">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="filterfromvalue">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="filterfromvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43721,7 +43959,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="filterfromnext">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="filterfromnext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -43736,7 +43974,7 @@
     <cd:content optional="yes"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="style" name="definemeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="style" name="definemeasure">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -43746,7 +43984,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="freezemeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="freezemeasure">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -43756,7 +43994,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setmeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setmeasure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43766,7 +44004,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setgmeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setgmeasure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43776,7 +44014,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setemeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setemeasure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43786,7 +44024,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setxmeasure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="setxmeasure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43796,21 +44034,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="style" name="measure">
+  <cd:command category="counter" file="syst-aux.mkiv" level="style" name="measure">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="style" name="measured">
+  <cd:command category="counter" file="syst-aux.mkiv" level="style" name="measured">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dividedsize">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="dividedsize">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43823,7 +44061,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimension">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedimension">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43836,7 +44074,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifdimensionelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdimensionelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43849,7 +44087,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimenstring">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsedimenstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43862,7 +44100,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifdimenstringelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifdimenstringelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43875,8 +44113,8 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="compresult"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="comparedimension">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="compresult"/>
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="comparedimension">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43886,7 +44124,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="comparedimensioneps">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="comparedimensioneps">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -43896,7 +44134,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letcscsname">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcscsname">
    <cd:arguments>
     <cd:csname/>
     <cd:delimiter name="csname"/>
@@ -43906,7 +44144,7 @@
     <cd:delimiter name="endcsname"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecs">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcsnamecs">
    <cd:arguments>
     <cd:delimiter name="csname"/>
     <cd:keywords delimiters="none">
@@ -43916,7 +44154,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecsname">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="letcsnamecsname">
    <cd:arguments>
     <cd:delimiter name="csname"/>
     <cd:keywords delimiters="none">
@@ -43930,7 +44168,7 @@
     <cd:delimiter name="endcsname"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="addvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="addvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -43940,14 +44178,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="unspaced">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaced">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="unspaceargument">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaceargument">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:text"/>
@@ -43956,7 +44194,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="unspaceafter">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="unspaceafter">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -43964,7 +44202,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsehasspace">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsehasspace">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43977,7 +44215,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifhasspaceelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifhasspaceelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -43990,28 +44228,28 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="setflag">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="setflag">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="resetflag">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="resetflag">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="flag">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="flag">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelseflagged">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseflagged">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44024,7 +44262,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifflaggedelse">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifflaggedelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44037,7 +44275,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnotflagged">
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnotflagged">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44047,7 +44285,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="inheritparameter">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="inheritparameter">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -44060,7 +44298,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifelsenonzeropositive">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelsenonzeropositive">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -44073,7 +44311,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="doifnonzeropositiveelse">
+  <cd:command category="strings" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifnonzeropositiveelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -44086,7 +44324,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getrawparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -44098,7 +44336,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getraweparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getraweparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -44110,7 +44348,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getrawgparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawgparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -44122,7 +44360,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getrawxparameters">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="getrawxparameters">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:text"/>
@@ -44134,7 +44372,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="unprotected">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="unprotected">
    <cd:arguments>
     <cd:keywords delimiters="none">
      <cd:constant type="cd:content"/>
@@ -44142,12 +44380,12 @@
     <cd:delimiter name="par"/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="resettimer"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="elapsedtime"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="elapsedseconds"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="elapsedsteptime"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="currentfeaturetest"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="testfeature">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="resettimer"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedtime"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedseconds"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="elapsedsteptime"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="currentfeaturetest"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="testfeature">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -44155,15 +44393,15 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="retestfeature"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="showtimer">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="retestfeature"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="showtimer">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="testfeatureonce">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="testfeatureonce">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -44171,20 +44409,20 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="freezedimenmacro">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="freezedimenmacro">
    <cd:arguments>
     <cd:csname/>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="negated">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="negated">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="assigndimen">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="assigndimen">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -44192,7 +44430,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="appendvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44202,7 +44440,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="appendgvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="appendgvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44212,7 +44450,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="prependvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44222,7 +44460,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="prependgvalue">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="prependgvalue">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44232,7 +44470,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="processranges">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="processranges">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:number"/>
@@ -44241,7 +44479,7 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="dowithrange">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="dowithrange">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:number"/>
@@ -44250,9 +44488,9 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ignoreimplicitspaces"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="nointerference" type="environment"/>
-  <cd:command file="syst-aux.mkiv" level="system" name="expandcheckedcsname">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="ignoreimplicitspaces"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="nointerference" type="environment"/>
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="expandcheckedcsname">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -44263,39 +44501,39 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="docheckedpair">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="docheckedpair">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="constantnumber">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantnumber">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="constantnumberargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantnumberargument">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="constantdimen">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantdimen">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="constantdimenargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantdimenargument">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="constantemptyargument">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="constantemptyargument">
    <cd:arguments>
     <cd:csname/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="getsubstring">
+  <cd:command category="strings" file="syst-aux.mkiv" level="system" name="getsubstring">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -44308,7 +44546,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="converteddimen">
+  <cd:command category="counter" file="syst-aux.mkiv" level="system" name="converteddimen">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:dimension"/>
@@ -44329,7 +44567,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-aux.mkiv" level="system" name="ntimes">
+  <cd:command category="system" file="syst-aux.mkiv" level="system" name="ntimes">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -44339,7 +44577,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifelse">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelse">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44351,7 +44589,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoif">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoif">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44360,7 +44598,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifnot">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifnot">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44369,7 +44607,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expandeddoif">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoif">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44378,7 +44616,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifnot">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoifnot">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44387,7 +44625,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifelse">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expandeddoifelse">
    <cd:arguments>
     <cd:content/>
     <cd:content/>
@@ -44399,7 +44637,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelsecommon">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -44415,7 +44653,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifcommonelse">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifcommonelse">
    <cd:arguments>
     <cd:keywords delimiters="braces" list="yes">
      <cd:constant type="cd:text"/>
@@ -44431,7 +44669,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifelseinset">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifelseinset">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -44447,7 +44685,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="expdoifinsetelse">
+  <cd:command category="strings" file="syst-lua.mkiv" keywords="conditional" level="system" name="expdoifinsetelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:text"/>
@@ -44463,12 +44701,12 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="syst-lua.mkiv" level="system" name="luaexpr">
+  <cd:command category="strings" file="syst-lua.mkiv" level="system" name="luaexpr">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-sys.mkiv" level="style" name="setupsystem">
+  <cd:command category="counter" file="core-sys.mkiv" level="style" name="setupsystem">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="n">
@@ -44479,7 +44717,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-systemlog.xml">
-  <cd:command file="core-sys.mkiv" level="system" name="systemlog">
+  <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemlog">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -44492,7 +44730,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-sys.mkiv" level="system" name="systemlogfirst">
+  <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemlogfirst">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -44505,7 +44743,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-sys.mkiv" level="system" name="systemloglast">
+  <cd:command category="tracker" file="core-sys.mkiv" level="system" name="systemloglast">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -44896,7 +45134,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifelseinelement">
+  <cd:command category="xml" file="strc-tag.mkiv" keywords="conditional" level="system" name="doifelseinelement">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44909,7 +45147,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifinelementelse">
+  <cd:command category="xml" file="strc-tag.mkiv" keywords="conditional" level="system" name="doifinelementelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44922,7 +45160,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="taggedlabeltexts">
+  <cd:command category="xml" file="strc-tag.mkiv" keywords="language" level="system" name="taggedlabeltexts">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -44933,7 +45171,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts">
+  <cd:command category="xml" file="strc-tag.mkiv" keywords="language" level="system" name="namedtaggedlabeltexts">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45162,7 +45400,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflowcollector">
+  <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doifelsetextflowcollector">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45175,7 +45413,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse">
+  <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doiftextflowcollectorelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45188,7 +45426,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflow">
+  <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doifelsetextflow">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45201,7 +45439,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowelse">
+  <cd:command category="structure" file="page-flw.mkiv" keywords="conditional" level="system" name="doiftextflowelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45804,7 +46042,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayouttextline">
+  <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doifelselayouttextline">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45817,7 +46055,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse">
+  <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doiflayouttextlineelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45830,7 +46068,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline">
+  <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doifelselayoutsomeline">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -45843,7 +46081,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse">
+  <cd:command category="layout" file="page-txt.mkvi" keywords="conditional" level="system" name="doiflayoutsomelineelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46192,63 +46430,63 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-token.xml">
-  <cd:command file="toks-tra.mkiv" level="system" name="tokens" type="environment">
+  <cd:command category="strings" file="toks-tra.mkiv" level="system" name="tokens" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-tra.mkiv" level="system" name="flushtokens">
+  <cd:command category="strings" file="toks-tra.mkiv" level="system" name="flushtokens">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-tra.mkiv" level="system" name="showtokens">
+  <cd:command category="strings" file="toks-tra.mkiv" level="system" name="showtokens">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-tra.mkiv" level="system" name="testtokens">
+  <cd:command category="strings" file="toks-tra.mkiv" level="system" name="testtokens">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-aux.mkiv" level="style" name="definetokenlist">
+  <cd:command category="strings" file="toks-aux.mkiv" level="style" name="definetokenlist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-aux.mkiv" level="style" name="tokenlist" type="environment">
+  <cd:command category="strings" file="toks-aux.mkiv" level="style" name="tokenlist" type="environment">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-aux.mkiv" level="style" name="gettokenlist">
+  <cd:command category="strings" file="toks-aux.mkiv" level="style" name="gettokenlist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-aux.mkiv" level="style" name="resettokenlist">
+  <cd:command category="strings" file="toks-aux.mkiv" level="style" name="resettokenlist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="toks-aux.mkiv" level="style" name="settokenlist">
+  <cd:command category="strings" file="toks-aux.mkiv" level="style" name="settokenlist">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -46346,7 +46584,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-tracker.xml">
-  <cd:command file="trac-ctx.mkiv" level="system" name="installtextracker">
+  <cd:command category="tracker" file="trac-ctx.mkiv" level="system" name="installtextracker">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46359,7 +46597,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-ctx.mkiv" level="system" name="installtexdirective">
+  <cd:command category="tracker" file="trac-ctx.mkiv" level="system" name="installtexdirective">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46372,56 +46610,56 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="style" name="enabletrackers">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enabletrackers">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="style" name="disabletrackers">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disabletrackers">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="system" name="resettrackers"/>
-  <cd:command file="trac-deb.mkiv" level="document" name="showtrackers"/>
-  <cd:command file="trac-deb.mkiv" level="style" name="enabledirectives">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="resettrackers"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showtrackers"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enabledirectives">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="style" name="disabledirectives">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disabledirectives">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="document" name="showdirectives"/>
-  <cd:command file="trac-deb.mkiv" level="style" name="enableexperiments">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showdirectives"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="enableexperiments">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="style" name="disableexperiments">
+  <cd:command category="tracker" file="trac-deb.mkiv" level="style" name="disableexperiments">
    <cd:arguments>
     <cd:keywords list="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-deb.mkiv" level="document" name="showexperiments"/>
-  <cd:command file="trac-deb.mkiv" level="system" name="showedebuginfo"/>
-  <cd:command file="trac-deb.mkiv" level="system" name="overloaderror"/>
-  <cd:command file="trac-deb.mkiv" level="system" name="showlogcategories"/>
-  <cd:command file="trac-jus.mkiv" level="system" name="showjustification"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="document" name="showexperiments"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="showedebuginfo"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="overloaderror"/>
+  <cd:command category="tracker" file="trac-deb.mkiv" level="system" name="showlogcategories"/>
+  <cd:command category="tracker" file="trac-jus.mkiv" level="system" name="showjustification"/>
  </cd:interface>
  <cd:interface file="i-translation.xml">
   <cd:command category="language" file="lang-lab.mkiv" level="document" name="translate">
@@ -46446,7 +46684,7 @@
   </cd:command>
  </cd:interface>
  <cd:interface file="i-twopassdata.xml">
-  <cd:command file="core-two.mkiv" level="system" name="immediatesavetwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="immediatesavetwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46457,7 +46695,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="savetwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="savetwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46468,7 +46706,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="lazysavetwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="lazysavetwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46479,7 +46717,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="savetaggedtwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="savetaggedtwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46493,7 +46731,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46507,28 +46745,28 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="definetwopasslist">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="definetwopasslist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="gettwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="gettwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="checktwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="checktwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="findtwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="findtwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46538,21 +46776,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="getfirsttwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getfirsttwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="getlasttwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getlasttwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="getnamedtwopassdatalist">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getnamedtwopassdatalist">
    <cd:arguments>
     <cd:csname/>
     <cd:keywords delimiters="braces">
@@ -46560,14 +46798,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="gettwopassdatalist">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="gettwopassdatalist">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="doifelseintwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" keywords="conditional" level="system" name="doifelseintwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46583,7 +46821,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="doifintwopassdataelse">
+  <cd:command category="twopassdata" file="core-two.mkiv" keywords="conditional" level="system" name="doifintwopassdataelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -46599,7 +46837,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-two.mkiv" level="system" name="getfromtwopassdata">
+  <cd:command category="twopassdata" file="core-two.mkiv" level="system" name="getfromtwopassdata">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47047,7 +47285,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure" file="strc-usr.mkiv" level="document" name="userdata" type="environment">
+  <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="document" name="userdata" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -47087,11 +47325,11 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getuserdata"/>
-  <cd:command category="structure" file="strc-usr.mkiv" level="style" name="getinlineuserdata"/>
+  <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="style" name="getuserdata"/>
+  <cd:command category="structure" file="strc-usr.mkiv" keywords="buffer" level="style" name="getinlineuserdata"/>
  </cd:interface>
  <cd:interface file="i-variables.xml">
-  <cd:command file="core-env.mkiv" level="style" name="setvariables">
+  <cd:command category="strings" file="core-env.mkiv" level="style" name="setvariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -47109,7 +47347,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setevariables">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setevariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -47127,7 +47365,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setgvariables">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setgvariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -47145,7 +47383,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setxvariables">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setxvariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -47163,7 +47401,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="checkvariables">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="checkvariables">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -47181,7 +47419,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="setvariable">
+  <cd:command category="strings" file="core-env.mkiv" level="style" name="setvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47194,7 +47432,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setevariable">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setevariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47207,7 +47445,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setgvariable">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setgvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47220,7 +47458,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setxvariable">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setxvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47233,7 +47471,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="style" name="getvariable">
+  <cd:command category="strings" file="core-env.mkiv" level="style" name="getvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47243,7 +47481,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="showvariable">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="showvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47253,7 +47491,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsevariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelsevariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47269,7 +47507,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariableelse">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifvariableelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47285,7 +47523,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47298,7 +47536,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotvariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47311,7 +47549,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseemptyvariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelseemptyvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47327,7 +47565,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariableelse">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifemptyvariableelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47343,7 +47581,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifemptyvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47356,7 +47594,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotemptyvariable">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotemptyvariable">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47369,7 +47607,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="getvariabledefault">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="getvariabledefault">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47382,7 +47620,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="setupenv">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="setupenv">
    <cd:arguments>
     <cd:assignments list="yes">
      <cd:parameter name="set">
@@ -47397,7 +47635,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseenv">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifelseenv">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -47410,7 +47648,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenvelse">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifenvelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -47423,7 +47661,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenv">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifenv">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -47433,7 +47671,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotenv">
+  <cd:command category="strings" file="core-env.mkiv" keywords="conditional" level="system" name="doifnotenv">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -47443,14 +47681,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="env">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="env">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="core-env.mkiv" level="system" name="envvar">
+  <cd:command category="strings" file="core-env.mkiv" level="system" name="envvar">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:key"/>
@@ -47460,7 +47698,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="setdocumentfilename">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentfilename">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -47470,7 +47708,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargument">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47480,7 +47718,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47490,21 +47728,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="getdocumentfilename">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentfilename">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargument">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault">
+  <cd:command category="strings" file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47514,7 +47752,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentargument">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifelsedocumentargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47527,7 +47765,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentargumentelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47540,7 +47778,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargument">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47550,7 +47788,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentargument">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifnotdocumentargument">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:name"/>
@@ -47560,7 +47798,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifelsedocumentfilename">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -47573,7 +47811,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentfilenameelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -47586,7 +47824,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilename">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifdocumentfilename">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -47596,7 +47834,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename">
+  <cd:command category="strings" file="luat-ini.mkiv" keywords="conditional" level="system" name="doifnotdocumentfilename">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -47864,7 +48102,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance">
+  <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" keywords="buffer" level="document" name="typing" type="environment" variant="instance">
    <cd:sequence>
     <cd:instance value="typing"/>
    </cd:sequence>
@@ -47882,7 +48120,7 @@
     <cd:constant value="XML"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance:argument">
+  <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" keywords="buffer" level="document" name="typing" type="environment" variant="instance:argument">
    <cd:sequence>
     <cd:instance value="typing"/>
    </cd:sequence>
@@ -47955,7 +48193,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doifelsetypingfile">
+  <cd:command category="verbatim" file="buff-ver.mkiv" keywords="conditional" level="system" name="doifelsetypingfile">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -47968,7 +48206,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="verbatim conditional" file="buff-ver.mkiv" level="system" name="doiftypingfileelse">
+  <cd:command category="verbatim" file="buff-ver.mkiv" keywords="conditional" level="system" name="doiftypingfileelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:file"/>
@@ -48022,7 +48260,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseolderversion">
+  <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifelseolderversion">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -48038,7 +48276,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifolderversionelse">
+  <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifolderversionelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -48054,7 +48292,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseoldercontext">
+  <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifelseoldercontext">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -48067,7 +48305,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifoldercontextelse">
+  <cd:command file="file-mod.mkvi" keywords="conditional" level="system" name="doifoldercontextelse">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -48147,7 +48385,7 @@
   <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="showlayoutcomponents"/>
  </cd:interface>
  <cd:interface file="i-visualizer.xml">
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledhbox">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledhbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48155,7 +48393,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledvbox">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvbox">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48163,7 +48401,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledvtop">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvtop">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48171,7 +48409,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledtopv">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledtopv">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48179,7 +48417,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledhpack">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledhpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48187,7 +48425,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledvpack">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledvpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48195,7 +48433,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledtpack">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledtpack">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48203,12 +48441,12 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="ruledmbox">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="rules" level="system" name="ruledmbox">
    <cd:arguments>
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxr">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxr">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48216,7 +48454,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxg">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxg">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48224,7 +48462,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxb">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxb">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48232,7 +48470,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxc">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxc">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48240,7 +48478,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxm">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxm">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48248,7 +48486,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxy">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxy">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48256,7 +48494,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trac-vis.mkiv" level="system" name="filledhboxk">
+  <cd:command category="boxes" file="trac-vis.mkiv" keywords="background colors" level="system" name="filledhboxk">
    <cd:arguments>
     <cd:keywords delimiters="none" optional="yes">
      <cd:constant type="cd:text"/>
@@ -48264,7 +48502,7 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trc-vis.mkiv" level="document" name="showmakeup">
+  <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showmakeup">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant default="yes" type="makeup"/>
@@ -48297,21 +48535,21 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trc-vis.mkiv" level="document" name="showallmakeup"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showboxes"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showglyphs"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showfontkerns"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showfontitalics"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showglyphdata"/>
-  <cd:command file="trc-vis.mkiv" level="document" name="showfontexpansion"/>
-  <cd:command file="trc-vis.mkiv" level="system" name="setvisualizerfont">
+  <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showallmakeup"/>
+  <cd:command category="boxes" file="trc-vis.mkiv" level="document" name="showboxes"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showglyphs"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontkerns"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontitalics"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showglyphdata"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="document" name="showfontexpansion"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="system" name="setvisualizerfont">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:font"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command file="trc-vis.mkiv" level="system" name="resetvisualizers"/>
+  <cd:command category="fonts" file="trc-vis.mkiv" level="system" name="resetvisualizers"/>
  </cd:interface>
  <cd:interface file="i-vspace.xml">
   <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacingamount">
@@ -48576,7 +48814,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="alignment" file="spac-ver.mkiv" level="system" name="forgetparskip"/>
+  <cd:command category="whitespace" file="spac-ver.mkiv" keywords="alignment" level="system" name="forgetparskip"/>
  </cd:interface>
  <cd:interface file="i-xml.xml">
   <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain">
@@ -49894,9 +50132,16 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldepth">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:node"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-xtable.xml">
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="definextable">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="definextable">
    <cd:arguments>
     <cd:keywords>
      <cd:constant type="cd:name"/>
@@ -49909,7 +50154,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="setupxtable">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="setupxtable">
    <cd:arguments>
     <cd:keywords list="yes" optional="yes">
      <cd:constant type="cd:name"/>
@@ -49997,35 +50242,35 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtable" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtable" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="embeddedxtable" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="style" name="embeddedxtable" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" level="document" name="xtable" type="environment" variant="example">
+  <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" keywords="background rules" level="document" name="xtable" type="environment" variant="example">
    <cd:sequence>
     <cd:variable value="xtable"/>
    </cd:sequence>
@@ -50035,14 +50280,14 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="processxtablebuffer">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="processxtablebuffer">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrow" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xrow" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -50052,21 +50297,21 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcolumn" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcolumn" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcolumn" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcell" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcell" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -50088,63 +50333,63 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablehead" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablehead" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablefoot" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablefoot" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablenext" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablenext" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablebody" type="environment">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupxtable"/>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment" variant="name">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xtablebody" type="environment" variant="name">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xgroup" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xgroup" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -50154,7 +50399,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrowgroup" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xrowgroup" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -50164,7 +50409,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcellgroup" type="environment">
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="document" name="xcellgroup" type="environment">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:name"/>
@@ -50174,7 +50419,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablerow"/>
-  <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablecolumn"/>
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="system" name="currentxtablerow"/>
+  <cd:command category="tables" file="tabl-xtb.mkvi" keywords="background rules" level="system" name="currentxtablecolumn"/>
  </cd:interface>
 </cd:interface>
-- 
cgit v1.2.3