2020-07-13 16:31:00

237 files changed, 5843 insertions, 5007 deletions

diff --git a/context/data/scite/context/lexers/data/scite-context-data-context.lua b/context/data/scite/context/lexers/data/scite-context-data-context.lua
index a9d03c35a..be341f4cb 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-context.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-context.lua
@@ -1,4 +1,4 @@
 return {
  ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "vadjustgroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol" },
- ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs" },
+ ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs" },
 }
\ No newline at end of file
diff --git a/context/data/scite/context/scite-context-data-context.properties b/context/data/scite/context/scite-context-data-context.properties
index f877217e3..546e8ac98 100644
--- a/context/data/scite/context/scite-context-data-context.properties
+++ b/context/data/scite/context/scite-context-data-context.properties
@@ -148,100 +148,101 @@ doifcommonelse doifcommon doifnotcommon doifinstring doifnotinstring \
 doifelseinstring doifinstringelse doifelseassignment doifassignmentelse docheckassignment \
 doifelseassignmentcs doifassignmentelsecs validassignment novalidassignment doiftext \
 doifelsetext doiftextelse doifnottext quitcondition truecondition \
-falsecondition tracingall tracingnone loggingall removetoks \
-appendtoks prependtoks appendtotoks prependtotoks to \
-endgraf endpar everyendpar reseteverypar finishpar \
-empty null space quad enspace \
-emspace charspace nbsp crlf obeyspaces \
-obeylines obeyedspace obeyedline obeyedtab obeyedpage \
-normalspace executeifdefined singleexpandafter doubleexpandafter tripleexpandafter \
-dontleavehmode removelastspace removeunwantedspaces keepunwantedspaces removepunctuation \
-ignoreparskip forcestrutdepth onlynonbreakablespace wait writestatus \
-define defineexpandable redefine setmeasure setemeasure \
-setgmeasure setxmeasure definemeasure freezemeasure measure \
-measured directmeasure setquantity setequantity setgquantity \
-setxquantity definequantity freezequantity quantity quantitied \
-directquantity installcorenamespace getvalue getuvalue setvalue \
-setevalue setgvalue setxvalue letvalue letgvalue \
-resetvalue undefinevalue ignorevalue setuvalue setuevalue \
-setugvalue setuxvalue globallet glet udef \
-ugdef uedef uxdef checked unique \
-getparameters geteparameters getgparameters getxparameters forgetparameters \
-copyparameters getdummyparameters dummyparameter directdummyparameter setdummyparameter \
-letdummyparameter setexpandeddummyparameter usedummystyleandcolor usedummystyleparameter usedummycolorparameter \
-processcommalist processcommacommand quitcommalist quitprevcommalist processaction \
-processallactions processfirstactioninset processallactionsinset unexpanded expanded \
-startexpanded stopexpanded protect unprotect firstofoneargument \
-firstoftwoarguments secondoftwoarguments firstofthreearguments secondofthreearguments thirdofthreearguments \
-firstoffourarguments secondoffourarguments thirdoffourarguments fourthoffourarguments firstoffivearguments \
-secondoffivearguments thirdoffivearguments fourthoffivearguments fifthoffivearguments firstofsixarguments \
-secondofsixarguments thirdofsixarguments fourthofsixarguments fifthofsixarguments sixthofsixarguments \
-firstofoneunexpanded firstoftwounexpanded secondoftwounexpanded firstofthreeunexpanded secondofthreeunexpanded \
-thirdofthreeunexpanded gobbleoneargument gobbletwoarguments gobblethreearguments gobblefourarguments \
-gobblefivearguments gobblesixarguments gobblesevenarguments gobbleeightarguments gobbleninearguments \
-gobbletenarguments gobbleoneoptional gobbletwooptionals gobblethreeoptionals gobblefouroptionals \
-gobblefiveoptionals dorecurse doloop exitloop dostepwiserecurse \
-recurselevel recursedepth dofastloopcs fastloopindex fastloopfinal \
-dowith newconstant setnewconstant setconstant setconstantvalue \
-newconditional settrue setfalse settruevalue setfalsevalue \
-newmacro setnewmacro newfraction newsignal dosingleempty \
-dodoubleempty dotripleempty doquadrupleempty doquintupleempty dosixtupleempty \
-doseventupleempty dosingleargument dodoubleargument dotripleargument doquadrupleargument \
-doquintupleargument dosixtupleargument doseventupleargument dosinglegroupempty dodoublegroupempty \
-dotriplegroupempty doquadruplegroupempty doquintuplegroupempty permitspacesbetweengroups dontpermitspacesbetweengroups \
-nopdfcompression maximumpdfcompression normalpdfcompression onlypdfobjectcompression nopdfobjectcompression \
-modulonumber dividenumber getfirstcharacter doifelsefirstchar doiffirstcharelse \
-startnointerference stopnointerference twodigits threedigits leftorright \
-offinterlineskip oninterlineskip nointerlineskip strut halfstrut \
-quarterstrut depthstrut halflinestrut noheightstrut setstrut \
-strutbox strutht strutdp strutwd struthtdp \
-strutgap begstrut endstrut lineheight leftboundary \
-rightboundary signalcharacter shiftbox vpackbox hpackbox \
-vpackedbox hpackedbox ordordspacing ordopspacing ordbinspacing \
-ordrelspacing ordopenspacing ordclosespacing ordpunctspacing ordinnerspacing \
-opordspacing opopspacing opbinspacing oprelspacing opopenspacing \
-opclosespacing oppunctspacing opinnerspacing binordspacing binopspacing \
-binbinspacing binrelspacing binopenspacing binclosespacing binpunctspacing \
-bininnerspacing relordspacing relopspacing relbinspacing relrelspacing \
-relopenspacing relclosespacing relpunctspacing relinnerspacing openordspacing \
-openopspacing openbinspacing openrelspacing openopenspacing openclosespacing \
-openpunctspacing openinnerspacing closeordspacing closeopspacing closebinspacing \
-closerelspacing closeopenspacing closeclosespacing closepunctspacing closeinnerspacing \
-punctordspacing punctopspacing punctbinspacing punctrelspacing punctopenspacing \
-punctclosespacing punctpunctspacing punctinnerspacing innerordspacing inneropspacing \
-innerbinspacing innerrelspacing inneropenspacing innerclosespacing innerpunctspacing \
-innerinnerspacing normalreqno startimath stopimath normalstartimath \
-normalstopimath startdmath stopdmath normalstartdmath normalstopdmath \
-normalsuperscript normalsubscript normalnosuperscript normalnosubscript superscript \
-subscript nosuperscript nosubscript superprescript subprescript \
-nosuperprescript nosubsprecript uncramped cramped mathstyletrigger \
-triggermathstyle mathstylefont mathsmallstylefont mathstyleface mathsmallstyleface \
-mathstylecommand mathpalette mathstylehbox mathstylevbox mathstylevcenter \
-mathstylevcenteredhbox mathstylevcenteredvbox mathtext setmathsmalltextbox setmathtextbox \
-pushmathstyle popmathstyle triggerdisplaystyle triggertextstyle triggerscriptstyle \
-triggerscriptscriptstyle triggeruncrampedstyle triggercrampedstyle triggersmallstyle triggeruncrampedsmallstyle \
-triggercrampedsmallstyle triggerbigstyle triggeruncrampedbigstyle triggercrampedbigstyle luaexpr \
-expelsedoif expdoif expdoifnot expdoifelsecommon expdoifcommonelse \
-expdoifelseinset expdoifinsetelse ctxdirectlua ctxlatelua ctxsprint \
-ctxwrite ctxcommand ctxdirectcommand ctxlatecommand ctxreport \
-ctxlua luacode lateluacode directluacode registerctxluafile \
-ctxloadluafile luaversion luamajorversion luaminorversion ctxluacode \
-luaconditional luaexpanded startluaparameterset stopluaparameterset luaparameterset \
-definenamedlua obeylualines obeyluatokens startluacode stopluacode \
-startlua stoplua startctxfunction stopctxfunction ctxfunction \
-startctxfunctiondefinition stopctxfunctiondefinition installctxfunction installprotectedctxfunction installprotectedctxscanner \
-installctxscanner resetctxscanner cldprocessfile cldloadfile cldloadviafile \
-cldcontext cldcommand carryoverpar lastlinewidth assumelongusagecs \
-Umathbotaccent righttolefthbox lefttorighthbox righttoleftvbox lefttorightvbox \
-righttoleftvtop lefttorightvtop rtlhbox ltrhbox rtlvbox \
-ltrvbox rtlvtop ltrvtop autodirhbox autodirvbox \
-autodirvtop leftorrighthbox leftorrightvbox leftorrightvtop lefttoright \
-righttoleft checkedlefttoright checkedrighttoleft synchronizelayoutdirection synchronizedisplaydirection \
-synchronizeinlinedirection dirlre dirrle dirlro dirrlo \
-lesshyphens morehyphens nohyphens dohyphens Ucheckedstartdisplaymath \
-Ucheckedstopdisplaymath break nobreak allowbreak goodbreak \
-nospace nospacing dospacing naturalhbox naturalvbox \
-naturalvtop naturalhpack naturalvpack naturaltpack reversehbox \
-reversevbox reversevtop reversehpack reversevpack reversetpack \
-frule compoundhyphenpenalty start stop unsupportedcs 
+falsecondition tracingall tracingnone loggingall showluatokens \
+removetoks appendtoks prependtoks appendtotoks prependtotoks \
+to endgraf endpar everyendpar reseteverypar \
+finishpar empty null space quad \
+enspace emspace charspace nbsp crlf \
+obeyspaces obeylines obeyedspace obeyedline obeyedtab \
+obeyedpage normalspace executeifdefined singleexpandafter doubleexpandafter \
+tripleexpandafter dontleavehmode removelastspace removeunwantedspaces keepunwantedspaces \
+removepunctuation ignoreparskip forcestrutdepth onlynonbreakablespace wait \
+writestatus define defineexpandable redefine setmeasure \
+setemeasure setgmeasure setxmeasure definemeasure freezemeasure \
+measure measured directmeasure setquantity setequantity \
+setgquantity setxquantity definequantity freezequantity quantity \
+quantitied directquantity installcorenamespace getvalue getuvalue \
+setvalue setevalue setgvalue setxvalue letvalue \
+letgvalue resetvalue undefinevalue ignorevalue setuvalue \
+setuevalue setugvalue setuxvalue globallet glet \
+udef ugdef uedef uxdef checked \
+unique getparameters geteparameters getgparameters getxparameters \
+forgetparameters copyparameters getdummyparameters dummyparameter directdummyparameter \
+setdummyparameter letdummyparameter setexpandeddummyparameter usedummystyleandcolor usedummystyleparameter \
+usedummycolorparameter processcommalist processcommacommand quitcommalist quitprevcommalist \
+processaction processallactions processfirstactioninset processallactionsinset unexpanded \
+expanded startexpanded stopexpanded protect unprotect \
+firstofoneargument firstoftwoarguments secondoftwoarguments firstofthreearguments secondofthreearguments \
+thirdofthreearguments firstoffourarguments secondoffourarguments thirdoffourarguments fourthoffourarguments \
+firstoffivearguments secondoffivearguments thirdoffivearguments fourthoffivearguments fifthoffivearguments \
+firstofsixarguments secondofsixarguments thirdofsixarguments fourthofsixarguments fifthofsixarguments \
+sixthofsixarguments firstofoneunexpanded firstoftwounexpanded secondoftwounexpanded firstofthreeunexpanded \
+secondofthreeunexpanded thirdofthreeunexpanded gobbleoneargument gobbletwoarguments gobblethreearguments \
+gobblefourarguments gobblefivearguments gobblesixarguments gobblesevenarguments gobbleeightarguments \
+gobbleninearguments gobbletenarguments gobbleoneoptional gobbletwooptionals gobblethreeoptionals \
+gobblefouroptionals gobblefiveoptionals dorecurse doloop exitloop \
+dostepwiserecurse recurselevel recursedepth dofastloopcs fastloopindex \
+fastloopfinal dowith newconstant setnewconstant setconstant \
+setconstantvalue newconditional settrue setfalse settruevalue \
+setfalsevalue newmacro setnewmacro newfraction newsignal \
+dosingleempty dodoubleempty dotripleempty doquadrupleempty doquintupleempty \
+dosixtupleempty doseventupleempty dosingleargument dodoubleargument dotripleargument \
+doquadrupleargument doquintupleargument dosixtupleargument doseventupleargument dosinglegroupempty \
+dodoublegroupempty dotriplegroupempty doquadruplegroupempty doquintuplegroupempty permitspacesbetweengroups \
+dontpermitspacesbetweengroups nopdfcompression maximumpdfcompression normalpdfcompression onlypdfobjectcompression \
+nopdfobjectcompression modulonumber dividenumber getfirstcharacter doifelsefirstchar \
+doiffirstcharelse startnointerference stopnointerference twodigits threedigits \
+leftorright offinterlineskip oninterlineskip nointerlineskip strut \
+halfstrut quarterstrut depthstrut halflinestrut noheightstrut \
+setstrut strutbox strutht strutdp strutwd \
+struthtdp strutgap begstrut endstrut lineheight \
+leftboundary rightboundary signalcharacter shiftbox vpackbox \
+hpackbox vpackedbox hpackedbox ordordspacing ordopspacing \
+ordbinspacing ordrelspacing ordopenspacing ordclosespacing ordpunctspacing \
+ordinnerspacing opordspacing opopspacing opbinspacing oprelspacing \
+opopenspacing opclosespacing oppunctspacing opinnerspacing binordspacing \
+binopspacing binbinspacing binrelspacing binopenspacing binclosespacing \
+binpunctspacing bininnerspacing relordspacing relopspacing relbinspacing \
+relrelspacing relopenspacing relclosespacing relpunctspacing relinnerspacing \
+openordspacing openopspacing openbinspacing openrelspacing openopenspacing \
+openclosespacing openpunctspacing openinnerspacing closeordspacing closeopspacing \
+closebinspacing closerelspacing closeopenspacing closeclosespacing closepunctspacing \
+closeinnerspacing punctordspacing punctopspacing punctbinspacing punctrelspacing \
+punctopenspacing punctclosespacing punctpunctspacing punctinnerspacing innerordspacing \
+inneropspacing innerbinspacing innerrelspacing inneropenspacing innerclosespacing \
+innerpunctspacing innerinnerspacing normalreqno startimath stopimath \
+normalstartimath normalstopimath startdmath stopdmath normalstartdmath \
+normalstopdmath normalsuperscript normalsubscript normalnosuperscript normalnosubscript \
+superscript subscript nosuperscript nosubscript superprescript \
+subprescript nosuperprescript nosubsprecript uncramped cramped \
+mathstyletrigger triggermathstyle mathstylefont mathsmallstylefont mathstyleface \
+mathsmallstyleface mathstylecommand mathpalette mathstylehbox mathstylevbox \
+mathstylevcenter mathstylevcenteredhbox mathstylevcenteredvbox mathtext setmathsmalltextbox \
+setmathtextbox pushmathstyle popmathstyle triggerdisplaystyle triggertextstyle \
+triggerscriptstyle triggerscriptscriptstyle triggeruncrampedstyle triggercrampedstyle triggersmallstyle \
+triggeruncrampedsmallstyle triggercrampedsmallstyle triggerbigstyle triggeruncrampedbigstyle triggercrampedbigstyle \
+luaexpr expelsedoif expdoif expdoifnot expdoifelsecommon \
+expdoifcommonelse expdoifelseinset expdoifinsetelse ctxdirectlua ctxlatelua \
+ctxsprint ctxwrite ctxcommand ctxdirectcommand ctxlatecommand \
+ctxreport ctxlua luacode lateluacode directluacode \
+registerctxluafile ctxloadluafile luaversion luamajorversion luaminorversion \
+ctxluacode luaconditional luaexpanded startluaparameterset stopluaparameterset \
+luaparameterset definenamedlua obeylualines obeyluatokens startluacode \
+stopluacode startlua stoplua startctxfunction stopctxfunction \
+ctxfunction startctxfunctiondefinition stopctxfunctiondefinition installctxfunction installprotectedctxfunction \
+installprotectedctxscanner installctxscanner resetctxscanner cldprocessfile cldloadfile \
+cldloadviafile cldcontext cldcommand carryoverpar lastlinewidth \
+assumelongusagecs Umathbotaccent righttolefthbox lefttorighthbox righttoleftvbox \
+lefttorightvbox righttoleftvtop lefttorightvtop rtlhbox ltrhbox \
+rtlvbox ltrvbox rtlvtop ltrvtop autodirhbox \
+autodirvbox autodirvtop leftorrighthbox leftorrightvbox leftorrightvtop \
+lefttoright righttoleft checkedlefttoright checkedrighttoleft synchronizelayoutdirection \
+synchronizedisplaydirection synchronizeinlinedirection dirlre dirrle dirlro \
+dirrlo lesshyphens morehyphens nohyphens dohyphens \
+Ucheckedstartdisplaymath Ucheckedstopdisplaymath break nobreak allowbreak \
+goodbreak nospace nospacing dospacing naturalhbox \
+naturalvbox naturalvtop naturalhpack naturalvpack naturaltpack \
+reversehbox reversevbox reversevtop reversehpack reversevpack \
+reversetpack frule compoundhyphenpenalty start stop \
+unsupportedcs 
 
diff --git a/context/data/textadept/context/data/scite-context-data-context.lua b/context/data/textadept/context/data/scite-context-data-context.lua
index a9d03c35a..be341f4cb 100644
--- a/context/data/textadept/context/data/scite-context-data-context.lua
+++ b/context/data/textadept/context/data/scite-context-data-context.lua
@@ -1,4 +1,4 @@
 return {
  ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "vadjustgroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol" },
- ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs" },
+ ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs" },
 }
\ No newline at end of file
diff --git a/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json b/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
index 6b9431128..17c6b6b2d 100644
--- a/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
+++ b/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
@@ -88,7 +88,7 @@
    "name" : "context.grouping.symbols.groups.tex"
   },
   "helper" : {
-   "match" : "\u005C\u005C(xmlsetup|writestatus|wait|vpackedbox|vpackbox|vkern|vglue|vfillneg|vfilllneg|vfilll|validassignment|uxdef|usedummystyleparameter|usedummystyleandcolor|usedummycolorparameter|usedlineskiplimit|usedlineskip|usedbaselineskip|unvoidbox|unsupportedcs|unprotect|unique|unexpanded|undefinevalue|uncramped|ugdef|uedef|uedcatcodecommand|udef|twodigits|truecondition|tripleexpandafter|triggeruncrampedstyle|triggeruncrampedsmallstyle|triggeruncrampedbigstyle|triggertextstyle|triggersmallstyle|triggerscriptstyle|triggerscriptscriptstyle|triggermathstyle|triggergroupedcommandcs|triggergroupedcommand|triggerdisplaystyle|triggercrampedstyle|triggercrampedsmallstyle|triggercrampedbigstyle|triggerbigstyle|tracingnone|tracingall|to|threedigits|thirdofthreeunexpanded|thirdofthreearguments|thirdofsixarguments|thirdoffourarguments|thirdoffivearguments|thirdargumenttrue|thirdargumentfalse|then|texsetup|texdefinition|synchronizelayoutdirection|synchronizeinlinedirection|synchronizedisplaydirection|superscript|superprescript|subscript|subprescript|strutwd|struthtdp|strutht|strutgap|strutdp|strutbox|strut|strippedcsname|stopxmlsetups|stoptexsetups|stoptexdefinition|stoptexcode|stopsetups|stoprawsetups|stoppickupmath|stopnointerference|stopluasetups|stopluaparameterset|stopluacode|stoplua|stoplocalsetups|stopimath|stopforceddisplaymath|stopextendcatcodetable|stopexpanded|stopdmath|stopctxfunctiondefinition|stopctxfunction|stopcontextdefinitioncode|stopcontextcode|stopcatcodetable|stop|startxmlsetups|starttexsetups|starttexdefinition|starttexcode|startsetups|startrawsetups|startpickupmath|startnointerference|startluasetups|startluaparameterset|startluacode|startlua|startlocalsetups|startimath|startforceddisplaymath|startextendcatcodetable|startexpanded|startdmath|startctxfunctiondefinition|startctxfunction|startcontextdefinitioncode|startcontextcode|startcatcodetable|start|space|sixthofsixarguments|sixthargumenttrue|sixthargumentfalse|singleexpandafter|simplegroupedcommand|signalcharacter|shiftbox|seventhargumenttrue|seventhargumentfalse|setxvalue|setxquantity|setxmeasure|setvalue|setuxvalue|setuvalue|setups|setup|setugvalue|setuevalue|settruevalue|settrue|setsystemmode|setstrut|setquantity|setnewmacro|setnewconstant|setmode|setmeasure|setmathtextbox|setmathsmalltextbox|setlocalhsize|setgvalue|setgquantity|setgmeasure|setfalsevalue|setfalse|setexpandeddummyparameter|setevalue|setequantity|setemeasure|setdummyparameter|setconstantvalue|setconstant|setcatcodetable|secondoftwounexpanded|secondoftwoarguments|secondofthreeunexpanded|secondofthreearguments|secondofsixarguments|secondoffourarguments|secondoffivearguments|secondargumenttrue|secondargumentfalse|scratchyposition|scratchyoffset|scratchxposition|scratchxoffset|scratchwidth|scratchvsize|scratchvoffset|scratchunicode|scratchtotal|scratchtopskip|scratchtopoffset|scratchtokstwo|scratchtoksthree|scratchtokssix|scratchtoksone|scratchtoksfour|scratchtoksfive|scratchtoks|scratchskiptwo|scratchskipthree|scratchskipsix|scratchskipone|scratchskipfour|scratchskipfive|scratchskip|scratchrightskip|scratchrightoffset|scratchoffset|scratchny|scratchnx|scratchmy|scratchmx|scratchmuskiptwo|scratchmuskipthree|scratchmuskipsix|scratchmuskipone|scratchmuskipfour|scratchmuskipfive|scratchmuskip|scratchmin|scratchmax|scratchleftskip|scratchleftoffset|scratchhsize|scratchhoffset|scratchheight|scratchdistance|scratchdimentwo|scratchdimenthree|scratchdimensix|scratchdimenone|scratchdimenfour|scratchdimenfive|scratchdimen|scratchdepth|scratchcountertwo|scratchcounterthree|scratchcountersix|scratchcounterone|scratchcounterfour|scratchcounterfive|scratchcounter|scratchboxtwo|scratchboxthree|scratchboxsix|scratchboxone|scratchboxfour|scratchboxfive|scratchbox|scratchbottomskip|scratchbottomoffset|scangivendimensions|ruledvtop|ruledvss|ruledvskip|ruledvpack|ruledvglue|ruledvfilneg|ruledvfillneg|ruledvfilll|ruledvfill|ruledvfil|ruledvcenter|ruledvbox|ruledtpack|ruledpenalty|ruledmskip|ruledmkern|ruledmbox|ruledkern|ruledhss|ruledhskip|ruledhpack|ruledhglue|ruledhfilneg|ruledhfillneg|ruledhfilll|ruledhfill|ruledhfil|ruledhbox|rtlvtop|rtlvbox|rtlhbox|righttoleftvtop|righttoleftvbox|righttolefthbox|righttoleft|rightboundary|reversevtop|reversevpack|reversevbox|reversetpack|reversehpack|reversehbox|restorecatcodes|resetvalue|resetsystemmode|resetsetups|resetmode|resetglobal|reseteverypar|resetctxscanner|reqno|removeunwantedspaces|removetoks|removepunctuation|removelastspace|relrelspacing|relpunctspacing|relordspacing|relopspacing|relopenspacing|relinnerspacing|relclosespacing|relbinspacing|registerctxluafile|redoglobal|redefine|recurselevel|recursedepth|quitprevcommalist|quitcondition|quitcommalist|quarterstrut|quantity|quantitied|quad|pushsystemmode|pushmathstyle|pushcatcodetable|punctrelspacing|punctpunctspacing|punctordspacing|punctopspacing|punctopenspacing|punctinnerspacing|punctclosespacing|punctbinspacing|protect|processfirstactioninset|processcommalist|processcommacommand|processallactionsinset|processallactions|processaction|privatescratchtoks|privatescratchskip|privatescratchmuskip|privatescratchdimen|privatescratchcounter|privatescratchbox|prependtotoks|prependtoks|popsystemmode|popmathstyle|popcatcodetable|pickupgroupedcommand|permitspacesbetweengroups|ordrelspacing|ordpunctspacing|ordordspacing|ordopspacing|ordopenspacing|ordinnerspacing|ordclosespacing|ordbinspacing|oprelspacing|oppunctspacing|opordspacing|opopspacing|opopenspacing|opinnerspacing|openrelspacing|openpunctspacing|openordspacing|openopspacing|openopenspacing|openinnerspacing|openclosespacing|openbinspacing|opclosespacing|opbinspacing|onlypdfobjectcompression|onlynonbreakablespace|oninterlineskip|offinterlineskip|obeyspaces|obeyluatokens|obeylualines|obeylines|obeyedtab|obeyedspace|obeyedpage|obeyedline|null|novalidassignment|nosuperscript|nosuperprescript|nosubsprecript|nosubscript|nospacing|nospace|normalvglue|normalvfillneg|normalvfilllneg|normalsuperscript|normalsubscript|normalstopimath|normalstopdmath|normalstartimath|normalstartdmath|normalspace|normalreqno|normalpdfcompression|normalnosuperscript|normalnosubscript|normalhglue|normalhfillneg|normalhfilllneg|nopdfobjectcompression|nopdfcompression|nointerlineskip|nohyphens|noheightstrut|nobreak|nexttoken|nextbox|next|newwrite|newtoks|newsystemmode|newskip|newsignal|newread|newmuskip|newmode|newmarks|newmacro|newlanguage|newinsert|newif|newhelp|newfraction|newfamily|newfam|newdimen|newcount|newconstant|newconditional|newcatcodetable|newbox|newattribute|nbsp|naturalvtop|naturalvpack|naturalvbox|naturaltpack|naturalhpack|naturalhbox|morehyphens|modulonumber|measured|measure|maximumpdfcompression|mathtext|mathstylevcenteredvbox|mathstylevcenteredhbox|mathstylevcenter|mathstylevbox|mathstyletrigger|mathstylehbox|mathstylefont|mathstyleface|mathstylecommand|mathsmallstylefont|mathsmallstyleface|mathpalette|mathortext|mathnothing|mathnolop|mathlimop|mathbox|mathalpha|luaversion|luasetup|luaparameterset|luaminorversion|luamajorversion|luaexpr|luaexpanded|luaconditional|luacode|ltrvtop|ltrvbox|ltrhbox|loggingall|localhsize|lineheight|letvalue|letgvalue|letdummyparameter|letcatcodecommand|lesshyphens|lefttorightvtop|lefttorightvbox|lefttorighthbox|lefttoright|leftorrightvtop|leftorrightvbox|leftorrighthbox|leftorright|leftboundary|lateluacode|lastlinewidth|keepunwantedspaces|installprotectedctxscanner|installprotectedctxfunction|installctxscanner|installctxfunction|installcorenamespace|innerrelspacing|innerpunctspacing|innerordspacing|inneropspacing|inneropenspacing|innerinnerspacing|innerclosespacing|innerbinspacing|inlineordisplaymath|indisplaymath|ignorevalue|ignoreparskip|htdp|hsizefraction|hpackedbox|hpackbox|hkern|hglue|hfillneg|hfilllneg|hfilll|halfstrut|halflinestrut|groupedcommandcs|groupedcommand|goodbreak|gobbletwooptionals|gobbletwoarguments|gobblethreeoptionals|gobblethreearguments|gobbletenarguments|gobblesixarguments|gobblesevenarguments|gobbleoneoptional|gobbleoneargument|gobbleninearguments|gobblefouroptionals|gobblefourarguments|gobblefiveoptionals|gobblefivearguments|gobbleeightarguments|globalsetsystemmode|globalsetmode|globalscratchtoks|globalscratchskip|globalscratchmuskip|globalscratchdimen|globalscratchcountertwo|globalscratchcounterthree|globalscratchcounterone|globalscratchcounter|globalscratchbox|globalresetsystemmode|globalresetmode|globallet|glet|givenwidth|givenheight|givendepth|getxparameters|getvalue|getuvalue|getparameters|getgparameters|getfirstcharacter|geteparameters|getdummyparameters|frule|freezequantity|freezemeasure|fourthofsixarguments|fourthoffourarguments|fourthoffivearguments|fourthargumenttrue|fourthargumentfalse|foundtrue|foundfalse|forgetparameters|forgetall|forcestrutdepth|forcedisplaymath|flushnextbox|firstoftwounexpanded|firstoftwoarguments|firstofthreeunexpanded|firstofthreearguments|firstofsixarguments|firstofoneunexpanded|firstofoneargument|firstoffourarguments|firstoffivearguments|firstinset|firstargumenttrue|firstargumentfalse|finishpar|filledhboxy|filledhboxr|filledhboxm|filledhboxk|filledhboxg|filledhboxc|filledhboxb|fifthofsixarguments|fifthoffivearguments|fifthargumenttrue|fifthargumentfalse|fastsetup|fastloopindex|fastloopfinal|falsecondition|expelsedoif|expdoifnot|expdoifinsetelse|expdoifelseinset|expdoifelsecommon|expdoifcommonelse|expdoif|expanded|exitloop|executeifdefined|everyendpar|enspace|endstrut|endpar|endgraf|emspace|empty|dummyparameter|dowithnextboxcs|dowithnextboxcontentcs|dowithnextboxcontent|dowithnextbox|dowith|doubleexpandafter|dotriplegroupempty|dotripleempty|dotripleargument|dostepwiserecurse|dospacing|dosixtupleempty|dosixtupleargument|dosinglegroupempty|dosingleempty|dosingleargument|doseventupleempty|doseventupleargument|dorecurse|doquintuplegroupempty|doquintupleempty|doquintupleargument|doquadruplegroupempty|doquadrupleempty|doquadrupleargument|dontpermitspacesbetweengroups|dontleavehmode|dontcomplain|donothing|donetrue|donefalse|doloop|doifvaluesomething|doifvaluenothingelse|doifvaluenothing|doifvalue|doifundefinedelse|doifundefined|doiftextelse|doiftext|doifsomethingelse|doifsomething|doifsetupselse|doifsetups|doifnumberelse|doifnumber|doifnotvalue|doifnottext|doifnotsetups|doifnotnumber|doifnotinstring|doifnotinset|doifnothingelse|doifnothing|doifnotcommon|doifnotcommandhandler|doifnot|doifnextparenthesiselse|doifnextoptionalelse|doifnextoptionalcselse|doifnextcharelse|doifnextcharcselse|doifnextbgroupelse|doifnextbgroupcselse|doifinstringelse|doifinstring|doifinsetelse|doifinset|doiffirstcharelse|doiffastoptionalcheckelse|doiffastoptionalcheckcselse|doifelsevaluenothing|doifelsevalue|doifelseundefined|doifelsetext|doifelsesomething|doifelsesetups|doifelsenumber|doifelsenothing|doifelsenextparenthesis|doifelsenextoptionalcs|doifelsenextoptional|doifelsenextcharcs|doifelsenextchar|doifelsenextbgroupcs|doifelsenextbgroup|doifelseinstring|doifelseinset|doifelsefirstchar|doifelsefastoptionalcheckcs|doifelsefastoptionalcheck|doifelsedimension|doifelsedefined|doifelsecommon|doifelsecommandhandler|doifelseassignmentcs|doifelseassignment|doifelse|doifdimensionelse|doifdefinedelse|doifdefined|doifcommonelse|doifcommon|doifcommandhandlerelse|doifcommandhandler|doifassignmentelsecs|doifassignmentelse|doif|dohyphens|doglobal|dofastloopcs|dodoublegroupempty|dodoubleempty|dodoubleargument|dodoglobal|docheckassignment|dividenumber|distributedhsize|dirrlo|dirrle|dirlro|dirlre|directsetup|directquantity|directmeasure|directluacode|directdummyparameter|depthstrut|definequantity|definenamedlua|definemeasure|defineexpandable|define|defcatcodecommand|defaultcatcodetable|currentcatcodetable|ctxwrite|ctxsprint|ctxreport|ctxluacode|ctxlua|ctxloadluafile|ctxlatelua|ctxlatecommand|ctxfunction|ctxdirectlua|ctxdirectcommand|ctxcommand|crlf|cramped|copysetups|copyparameters|compoundhyphenpenalty|closerelspacing|closepunctspacing|closeordspacing|closeopspacing|closeopenspacing|closeinnerspacing|closeclosespacing|closebinspacing|cldprocessfile|cldloadviafile|cldloadfile|cldcontext|cldcommand|checkedstrippedcsname|checkedrighttoleft|checkedlefttoright|checked|charspace|catcodetablename|carryoverpar|break|boxisempty|booleanmodevalue|binrelspacing|binpunctspacing|binordspacing|binopspacing|binopenspacing|bininnerspacing|binclosespacing|binbinspacing|begstrut|begcsname|availablehsize|autorule|autodirvtop|autodirvbox|autodirhbox|assumelongusagecs|appendtotoks|appendtoks|allowbreak|Umathbotaccent|Ucheckedstopdisplaymath|Ucheckedstartdisplaymath)(?=[^a-zA-Z])",
+   "match" : "\u005C\u005C(xmlsetup|writestatus|wait|vpackedbox|vpackbox|vkern|vglue|vfillneg|vfilllneg|vfilll|validassignment|uxdef|usedummystyleparameter|usedummystyleandcolor|usedummycolorparameter|usedlineskiplimit|usedlineskip|usedbaselineskip|unvoidbox|unsupportedcs|unprotect|unique|unexpanded|undefinevalue|uncramped|ugdef|uedef|uedcatcodecommand|udef|twodigits|truecondition|tripleexpandafter|triggeruncrampedstyle|triggeruncrampedsmallstyle|triggeruncrampedbigstyle|triggertextstyle|triggersmallstyle|triggerscriptstyle|triggerscriptscriptstyle|triggermathstyle|triggergroupedcommandcs|triggergroupedcommand|triggerdisplaystyle|triggercrampedstyle|triggercrampedsmallstyle|triggercrampedbigstyle|triggerbigstyle|tracingnone|tracingall|to|threedigits|thirdofthreeunexpanded|thirdofthreearguments|thirdofsixarguments|thirdoffourarguments|thirdoffivearguments|thirdargumenttrue|thirdargumentfalse|then|texsetup|texdefinition|synchronizelayoutdirection|synchronizeinlinedirection|synchronizedisplaydirection|superscript|superprescript|subscript|subprescript|strutwd|struthtdp|strutht|strutgap|strutdp|strutbox|strut|strippedcsname|stopxmlsetups|stoptexsetups|stoptexdefinition|stoptexcode|stopsetups|stoprawsetups|stoppickupmath|stopnointerference|stopluasetups|stopluaparameterset|stopluacode|stoplua|stoplocalsetups|stopimath|stopforceddisplaymath|stopextendcatcodetable|stopexpanded|stopdmath|stopctxfunctiondefinition|stopctxfunction|stopcontextdefinitioncode|stopcontextcode|stopcatcodetable|stop|startxmlsetups|starttexsetups|starttexdefinition|starttexcode|startsetups|startrawsetups|startpickupmath|startnointerference|startluasetups|startluaparameterset|startluacode|startlua|startlocalsetups|startimath|startforceddisplaymath|startextendcatcodetable|startexpanded|startdmath|startctxfunctiondefinition|startctxfunction|startcontextdefinitioncode|startcontextcode|startcatcodetable|start|space|sixthofsixarguments|sixthargumenttrue|sixthargumentfalse|singleexpandafter|simplegroupedcommand|signalcharacter|showluatokens|shiftbox|seventhargumenttrue|seventhargumentfalse|setxvalue|setxquantity|setxmeasure|setvalue|setuxvalue|setuvalue|setups|setup|setugvalue|setuevalue|settruevalue|settrue|setsystemmode|setstrut|setquantity|setnewmacro|setnewconstant|setmode|setmeasure|setmathtextbox|setmathsmalltextbox|setlocalhsize|setgvalue|setgquantity|setgmeasure|setfalsevalue|setfalse|setexpandeddummyparameter|setevalue|setequantity|setemeasure|setdummyparameter|setconstantvalue|setconstant|setcatcodetable|secondoftwounexpanded|secondoftwoarguments|secondofthreeunexpanded|secondofthreearguments|secondofsixarguments|secondoffourarguments|secondoffivearguments|secondargumenttrue|secondargumentfalse|scratchyposition|scratchyoffset|scratchxposition|scratchxoffset|scratchwidth|scratchvsize|scratchvoffset|scratchunicode|scratchtotal|scratchtopskip|scratchtopoffset|scratchtokstwo|scratchtoksthree|scratchtokssix|scratchtoksone|scratchtoksfour|scratchtoksfive|scratchtoks|scratchskiptwo|scratchskipthree|scratchskipsix|scratchskipone|scratchskipfour|scratchskipfive|scratchskip|scratchrightskip|scratchrightoffset|scratchoffset|scratchny|scratchnx|scratchmy|scratchmx|scratchmuskiptwo|scratchmuskipthree|scratchmuskipsix|scratchmuskipone|scratchmuskipfour|scratchmuskipfive|scratchmuskip|scratchmin|scratchmax|scratchleftskip|scratchleftoffset|scratchhsize|scratchhoffset|scratchheight|scratchdistance|scratchdimentwo|scratchdimenthree|scratchdimensix|scratchdimenone|scratchdimenfour|scratchdimenfive|scratchdimen|scratchdepth|scratchcountertwo|scratchcounterthree|scratchcountersix|scratchcounterone|scratchcounterfour|scratchcounterfive|scratchcounter|scratchboxtwo|scratchboxthree|scratchboxsix|scratchboxone|scratchboxfour|scratchboxfive|scratchbox|scratchbottomskip|scratchbottomoffset|scangivendimensions|ruledvtop|ruledvss|ruledvskip|ruledvpack|ruledvglue|ruledvfilneg|ruledvfillneg|ruledvfilll|ruledvfill|ruledvfil|ruledvcenter|ruledvbox|ruledtpack|ruledpenalty|ruledmskip|ruledmkern|ruledmbox|ruledkern|ruledhss|ruledhskip|ruledhpack|ruledhglue|ruledhfilneg|ruledhfillneg|ruledhfilll|ruledhfill|ruledhfil|ruledhbox|rtlvtop|rtlvbox|rtlhbox|righttoleftvtop|righttoleftvbox|righttolefthbox|righttoleft|rightboundary|reversevtop|reversevpack|reversevbox|reversetpack|reversehpack|reversehbox|restorecatcodes|resetvalue|resetsystemmode|resetsetups|resetmode|resetglobal|reseteverypar|resetctxscanner|reqno|removeunwantedspaces|removetoks|removepunctuation|removelastspace|relrelspacing|relpunctspacing|relordspacing|relopspacing|relopenspacing|relinnerspacing|relclosespacing|relbinspacing|registerctxluafile|redoglobal|redefine|recurselevel|recursedepth|quitprevcommalist|quitcondition|quitcommalist|quarterstrut|quantity|quantitied|quad|pushsystemmode|pushmathstyle|pushcatcodetable|punctrelspacing|punctpunctspacing|punctordspacing|punctopspacing|punctopenspacing|punctinnerspacing|punctclosespacing|punctbinspacing|protect|processfirstactioninset|processcommalist|processcommacommand|processallactionsinset|processallactions|processaction|privatescratchtoks|privatescratchskip|privatescratchmuskip|privatescratchdimen|privatescratchcounter|privatescratchbox|prependtotoks|prependtoks|popsystemmode|popmathstyle|popcatcodetable|pickupgroupedcommand|permitspacesbetweengroups|ordrelspacing|ordpunctspacing|ordordspacing|ordopspacing|ordopenspacing|ordinnerspacing|ordclosespacing|ordbinspacing|oprelspacing|oppunctspacing|opordspacing|opopspacing|opopenspacing|opinnerspacing|openrelspacing|openpunctspacing|openordspacing|openopspacing|openopenspacing|openinnerspacing|openclosespacing|openbinspacing|opclosespacing|opbinspacing|onlypdfobjectcompression|onlynonbreakablespace|oninterlineskip|offinterlineskip|obeyspaces|obeyluatokens|obeylualines|obeylines|obeyedtab|obeyedspace|obeyedpage|obeyedline|null|novalidassignment|nosuperscript|nosuperprescript|nosubsprecript|nosubscript|nospacing|nospace|normalvglue|normalvfillneg|normalvfilllneg|normalsuperscript|normalsubscript|normalstopimath|normalstopdmath|normalstartimath|normalstartdmath|normalspace|normalreqno|normalpdfcompression|normalnosuperscript|normalnosubscript|normalhglue|normalhfillneg|normalhfilllneg|nopdfobjectcompression|nopdfcompression|nointerlineskip|nohyphens|noheightstrut|nobreak|nexttoken|nextbox|next|newwrite|newtoks|newsystemmode|newskip|newsignal|newread|newmuskip|newmode|newmarks|newmacro|newlanguage|newinsert|newif|newhelp|newfraction|newfamily|newfam|newdimen|newcount|newconstant|newconditional|newcatcodetable|newbox|newattribute|nbsp|naturalvtop|naturalvpack|naturalvbox|naturaltpack|naturalhpack|naturalhbox|morehyphens|modulonumber|measured|measure|maximumpdfcompression|mathtext|mathstylevcenteredvbox|mathstylevcenteredhbox|mathstylevcenter|mathstylevbox|mathstyletrigger|mathstylehbox|mathstylefont|mathstyleface|mathstylecommand|mathsmallstylefont|mathsmallstyleface|mathpalette|mathortext|mathnothing|mathnolop|mathlimop|mathbox|mathalpha|luaversion|luasetup|luaparameterset|luaminorversion|luamajorversion|luaexpr|luaexpanded|luaconditional|luacode|ltrvtop|ltrvbox|ltrhbox|loggingall|localhsize|lineheight|letvalue|letgvalue|letdummyparameter|letcatcodecommand|lesshyphens|lefttorightvtop|lefttorightvbox|lefttorighthbox|lefttoright|leftorrightvtop|leftorrightvbox|leftorrighthbox|leftorright|leftboundary|lateluacode|lastlinewidth|keepunwantedspaces|installprotectedctxscanner|installprotectedctxfunction|installctxscanner|installctxfunction|installcorenamespace|innerrelspacing|innerpunctspacing|innerordspacing|inneropspacing|inneropenspacing|innerinnerspacing|innerclosespacing|innerbinspacing|inlineordisplaymath|indisplaymath|ignorevalue|ignoreparskip|htdp|hsizefraction|hpackedbox|hpackbox|hkern|hglue|hfillneg|hfilllneg|hfilll|halfstrut|halflinestrut|groupedcommandcs|groupedcommand|goodbreak|gobbletwooptionals|gobbletwoarguments|gobblethreeoptionals|gobblethreearguments|gobbletenarguments|gobblesixarguments|gobblesevenarguments|gobbleoneoptional|gobbleoneargument|gobbleninearguments|gobblefouroptionals|gobblefourarguments|gobblefiveoptionals|gobblefivearguments|gobbleeightarguments|globalsetsystemmode|globalsetmode|globalscratchtoks|globalscratchskip|globalscratchmuskip|globalscratchdimen|globalscratchcountertwo|globalscratchcounterthree|globalscratchcounterone|globalscratchcounter|globalscratchbox|globalresetsystemmode|globalresetmode|globallet|glet|givenwidth|givenheight|givendepth|getxparameters|getvalue|getuvalue|getparameters|getgparameters|getfirstcharacter|geteparameters|getdummyparameters|frule|freezequantity|freezemeasure|fourthofsixarguments|fourthoffourarguments|fourthoffivearguments|fourthargumenttrue|fourthargumentfalse|foundtrue|foundfalse|forgetparameters|forgetall|forcestrutdepth|forcedisplaymath|flushnextbox|firstoftwounexpanded|firstoftwoarguments|firstofthreeunexpanded|firstofthreearguments|firstofsixarguments|firstofoneunexpanded|firstofoneargument|firstoffourarguments|firstoffivearguments|firstinset|firstargumenttrue|firstargumentfalse|finishpar|filledhboxy|filledhboxr|filledhboxm|filledhboxk|filledhboxg|filledhboxc|filledhboxb|fifthofsixarguments|fifthoffivearguments|fifthargumenttrue|fifthargumentfalse|fastsetup|fastloopindex|fastloopfinal|falsecondition|expelsedoif|expdoifnot|expdoifinsetelse|expdoifelseinset|expdoifelsecommon|expdoifcommonelse|expdoif|expanded|exitloop|executeifdefined|everyendpar|enspace|endstrut|endpar|endgraf|emspace|empty|dummyparameter|dowithnextboxcs|dowithnextboxcontentcs|dowithnextboxcontent|dowithnextbox|dowith|doubleexpandafter|dotriplegroupempty|dotripleempty|dotripleargument|dostepwiserecurse|dospacing|dosixtupleempty|dosixtupleargument|dosinglegroupempty|dosingleempty|dosingleargument|doseventupleempty|doseventupleargument|dorecurse|doquintuplegroupempty|doquintupleempty|doquintupleargument|doquadruplegroupempty|doquadrupleempty|doquadrupleargument|dontpermitspacesbetweengroups|dontleavehmode|dontcomplain|donothing|donetrue|donefalse|doloop|doifvaluesomething|doifvaluenothingelse|doifvaluenothing|doifvalue|doifundefinedelse|doifundefined|doiftextelse|doiftext|doifsomethingelse|doifsomething|doifsetupselse|doifsetups|doifnumberelse|doifnumber|doifnotvalue|doifnottext|doifnotsetups|doifnotnumber|doifnotinstring|doifnotinset|doifnothingelse|doifnothing|doifnotcommon|doifnotcommandhandler|doifnot|doifnextparenthesiselse|doifnextoptionalelse|doifnextoptionalcselse|doifnextcharelse|doifnextcharcselse|doifnextbgroupelse|doifnextbgroupcselse|doifinstringelse|doifinstring|doifinsetelse|doifinset|doiffirstcharelse|doiffastoptionalcheckelse|doiffastoptionalcheckcselse|doifelsevaluenothing|doifelsevalue|doifelseundefined|doifelsetext|doifelsesomething|doifelsesetups|doifelsenumber|doifelsenothing|doifelsenextparenthesis|doifelsenextoptionalcs|doifelsenextoptional|doifelsenextcharcs|doifelsenextchar|doifelsenextbgroupcs|doifelsenextbgroup|doifelseinstring|doifelseinset|doifelsefirstchar|doifelsefastoptionalcheckcs|doifelsefastoptionalcheck|doifelsedimension|doifelsedefined|doifelsecommon|doifelsecommandhandler|doifelseassignmentcs|doifelseassignment|doifelse|doifdimensionelse|doifdefinedelse|doifdefined|doifcommonelse|doifcommon|doifcommandhandlerelse|doifcommandhandler|doifassignmentelsecs|doifassignmentelse|doif|dohyphens|doglobal|dofastloopcs|dodoublegroupempty|dodoubleempty|dodoubleargument|dodoglobal|docheckassignment|dividenumber|distributedhsize|dirrlo|dirrle|dirlro|dirlre|directsetup|directquantity|directmeasure|directluacode|directdummyparameter|depthstrut|definequantity|definenamedlua|definemeasure|defineexpandable|define|defcatcodecommand|defaultcatcodetable|currentcatcodetable|ctxwrite|ctxsprint|ctxreport|ctxluacode|ctxlua|ctxloadluafile|ctxlatelua|ctxlatecommand|ctxfunction|ctxdirectlua|ctxdirectcommand|ctxcommand|crlf|cramped|copysetups|copyparameters|compoundhyphenpenalty|closerelspacing|closepunctspacing|closeordspacing|closeopspacing|closeopenspacing|closeinnerspacing|closeclosespacing|closebinspacing|cldprocessfile|cldloadviafile|cldloadfile|cldcontext|cldcommand|checkedstrippedcsname|checkedrighttoleft|checkedlefttoright|checked|charspace|catcodetablename|carryoverpar|break|boxisempty|booleanmodevalue|binrelspacing|binpunctspacing|binordspacing|binopspacing|binopenspacing|bininnerspacing|binclosespacing|binbinspacing|begstrut|begcsname|availablehsize|autorule|autodirvtop|autodirvbox|autodirhbox|assumelongusagecs|appendtotoks|appendtoks|allowbreak|Umathbotaccent|Ucheckedstopdisplaymath|Ucheckedstartdisplaymath)(?=[^a-zA-Z])",
    "name" : "context.plain.commands.plain.tex"
   },
   "ifprimitive" : {
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index e4db222c9..d9c50e96b 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 7d9f46424..75875aee7 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index 7c92252e8..72782f896 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index ca7a9bbbf..59f603a12 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 0cee0b9bb..4d16223da 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index 482884cb6..460c7e01a 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
index 24143049b..f97b06880 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
index 9ce15011f..aeb65503c 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index e6e63a011..6d75c98c2 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index d88b02e92..d2910f110 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index 289286a97..29fc39deb 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
index 9d5a949dd..7ac7ca36d 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
index 187a20eef..04d845ce6 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 4f4ef468f..ca6381cc4 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index 2175a74f3..9e47f4f86 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/sources/general/manuals/evenmore/evenmore-tokens.tex b/doc/context/sources/general/manuals/evenmore/evenmore-tokens.tex
index d653703a9..8c1e3ccb0 100644
--- a/doc/context/sources/general/manuals/evenmore/evenmore-tokens.tex
+++ b/doc/context/sources/general/manuals/evenmore/evenmore-tokens.tex
@@ -9,10 +9,6 @@
 
 \startchapter[title=Tokens]
 
-\usemodule[article-basic,abbreviations-logos]
-
-\starttext
-
 {\em This is mostly a wrapup of some developments, and definitely not a tutorial.}
 
 Talking deep down \TEX\ is talking about tokens and nodes. Roughly spoken, from
diff --git a/doc/context/sources/general/manuals/libraries/libraries-mkiv.tex b/doc/context/sources/general/manuals/libraries/libraries-mkiv.tex
index f1801efc0..19c045f5f 100644
--- a/doc/context/sources/general/manuals/libraries/libraries-mkiv.tex
+++ b/doc/context/sources/general/manuals/libraries/libraries-mkiv.tex
@@ -240,17 +240,18 @@ There are some optional libraries present, like:
 
 \starttabulate[|l|l|l|l|l|]
 \FL
-\BC module                  \BC library        \BC windows     \BC unix           \NC \NR
+\BC module                  \BC library        \BC windows      \BC unix           \NC \NR
 \ML
-\NC libs-imp-curl           \NC curl           \NC libcurl     \NC libcurl        \NC \NR
-\NC libs-imp-mysql          \NC mysql          \NC libmysql    \NC libmysqlclient \NC \NR
-\NC libs-imp-sqlite         \NC sqlite         \NC sqlite3     \NC sqlite3        \NC \NR
-%NC libs-imp-postgress      \NC libpg          \NC libpg       \NC libpg          \NC \NR % untested
-\NC libs-imp-zint           \NC libzint        \NC libzint     \NC libzint        \NC \NR
-\NC libs-imp-mujs           \NC libmujs        \NC libmujs     \NC libmujs        \NC \NR
-\NC libs-imp-ghostscript    \NC ghostscript    \NC gswin64     \NC libgs          \NC \NR
-\NC libs-imp-graphicsmagick \NC graphicsmagick \NC several     \NC unknown        \NC \NR
-%NC font-phb-imp-internal   \NC hb             \NC libharfbuzz \NC libharfbuzz    \NC \NR % maybe, for idris, testing uniscribe
+\NC libs-imp-curl           \NC curl           \NC libcurl      \NC libcurl        \NC \NR
+\NC libs-imp-mysql          \NC mysql          \NC libmysql     \NC libmysqlclient \NC \NR
+\NC libs-imp-sqlite         \NC sqlite         \NC sqlite3      \NC sqlite3        \NC \NR
+%NC libs-imp-postgress      \NC libpg          \NC libpg        \NC libpg          \NC \NR % untested
+\NC libs-imp-zint           \NC libzint        \NC libzint      \NC libzint        \NC \NR
+\NC libs-imp-mujs           \NC libmujs        \NC libmujs      \NC libmujs        \NC \NR
+\NC libs-imp-kpse           \NC kpse           \NC kpathsea*w64 \NC libkpathsea    \NC \NR % left-over for mkii runner
+\NC libs-imp-ghostscript    \NC ghostscript    \NC gswin64      \NC libgs          \NC \NR
+\NC libs-imp-graphicsmagick \NC graphicsmagick \NC several      \NC unknown        \NC \NR
+%NC font-phb-imp-internal   \NC hb             \NC libharfbuzz  \NC libharfbuzz    \NC \NR % maybe, for idris, testing uniscribe
 \LL
 \stoptabulate
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
index 07790af29..af058197b 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
@@ -796,6 +796,9 @@ The first argument is one of \type {top}, \type {bottom}, \type {first}, \type
 number. When no arguments are given the current maximum number of classes is
 returned.
 
+When \type {tex.gettoks} gets an extra argument \type {true} it will return a
+table with userdata tokens.
+
 \stopsubsection
 
 \startsubsection[title={Character code registers: \type {[get|set]*code[s]}}]
@@ -2198,22 +2201,43 @@ a bit but for passing strings conversion to and from tokens has to be done anywa
 
 \startsubsection[title={Picking up one token}]
 
-\libindex {get_next}
+\libindex {scan_next}
+\libindex {scan_next_expanded}
+\libindex {skip_next}
+\libindex {skip_next_expanded}
+\libindex {peek_next}
+\libindex {peek_next_expanded}
 \libindex {scan_token}
 \libindex {expand}
 
 The scanners look for a sequence. When you want to pick up one token from the
-input you use \type {get_next}. This creates a token with the (low level)
+input you use \type {scan_next}. This creates a token with the (low level)
 properties as discussed next. This token is just the next one. If you want to
-enforce expansion first you can use \type {scan_token}. Internally tokens are
-characterized by a number that packs a lot of information. In order to access
-the bits of information a token is wrapped in a userdata object.
+enforce expansion first you can use \type {scan_token} or the \type {_expanded}
+variants. Internally tokens are characterized by a number that packs a lot of
+information. In order to access the bits of information a token is wrapped in a
+userdata object.
 
 The \type {expand} function will trigger expansion of the next token in the
 input. This can be quite unpredictable but when you call it you probably know
 enough about \TEX\ not to be too worried about that. It basically is a call to
 the internal expand related function.
 
+\starttabulate[|lT|p|]
+\DB name \BC explanation \NC \NR
+\TB
+\NC scan_next          \NC get the next token \NC \NR
+\NC scan_next_expanded \NC get the next expanded token \NC \NR
+\NC skip_next          \NC skip the next token \NC \NR
+\NC skip_next_expanded \NC skip the next expanded token \NC \NR
+\NC peek_next          \NC get the next token and put it back in the input \NC \NR
+\NC peek_next_expanded \NC get the next expanded token and put it back in the input \NC \NR
+\LL
+\stoptabulate
+
+The peek function accept a boolean argument that triggers skipping spaces and
+alike.
+
 \stopsubsection
 
 \startsubsection[title={Creating tokens}]
@@ -2241,7 +2265,7 @@ the internal expand related function.
 \libindex{get_frozen}
 \libindex{get_user}
 
-\libindex{get_next}
+\libindex{scan_next}
 
 The creator function can be used as follows:
 
@@ -2392,16 +2416,16 @@ and are to be seen as abstractions.
 
 \startsubsection[title={Pushing back}]
 
-\libindex{get_next}
+\libindex{scan_next}
 \libindex{put_next}
 
 There is a (for now) experimental putter:
 
 \starttyping
-local t1 = token.get_next()
-local t2 = token.get_next()
-local t3 = token.get_next()
-local t4 = token.get_next()
+local t1 = token.scan_next()
+local t2 = token.scan_next()
+local t3 = token.scan_next()
+local t4 = token.scan_next()
 -- watch out, we flush in sequence
 token.put_next { t1, t2 }
 -- but this one gets pushed in front
@@ -2509,9 +2533,9 @@ When scanning from \LUA\ we are not in a mode that defines (undefined) macros at
 all. There we just get the real primitive undefined macro token.
 
 \startbuffer
-\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\myfirstbar
-\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mysecondbar
-\directlua{local t = token.get_next() tex.print(t.id.." "..t.tok)}\mythirdbar
+\directlua{local t = token.scan_next() tex.print(t.id.." "..t.tok)}\myfirstbar
+\directlua{local t = token.scan_next() tex.print(t.id.." "..t.tok)}\mysecondbar
+\directlua{local t = token.scan_next() tex.print(t.id.." "..t.tok)}\mythirdbar
 \stopbuffer
 
 \startlines
diff --git a/doc/context/sources/general/manuals/mk/mk-environment.tex b/doc/context/sources/general/manuals/mk/mk-environment.tex
index 3472f3b04..bcbfa0851 100644
--- a/doc/context/sources/general/manuals/mk/mk-environment.tex
+++ b/doc/context/sources/general/manuals/mk/mk-environment.tex
@@ -8,6 +8,8 @@
 
 \usemodule[timing]
 
+\usemodule[obsolete-tokens]
+
 \useMPlibrary[dum]
 
 \dontcomplain
diff --git a/doc/context/sources/general/manuals/mk/mk-tokenspeak.tex b/doc/context/sources/general/manuals/mk/mk-tokenspeak.tex
index 590dbba43..8382f5cfc 100644
--- a/doc/context/sources/general/manuals/mk/mk-tokenspeak.tex
+++ b/doc/context/sources/general/manuals/mk/mk-tokenspeak.tex
@@ -212,7 +212,7 @@ The result looks like: \ctxlua {
         tokens.letters("12345"),
         tokens.egroup,
     }
-    tex.printlist (t)
+    tex.printlist(t)
     tokens.collectors.show(t)
 }
 
diff --git a/scripts/context/lua/mtx-kpse.lua b/scripts/context/lua/mtx-kpse.lua
new file mode 100644
index 000000000..025dd5ff5
--- /dev/null
+++ b/scripts/context/lua/mtx-kpse.lua
@@ -0,0 +1,90 @@
+if not modules then modules = { } end modules ['mtx-kpse'] = {
+    version   = 1.001,
+    comment   = "companion to mtxrun.lua",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+-- I decided to make this module after a report on the mailing list about
+-- a clash with texmf-var on a system that had texlive installed. One way
+-- to figure that out is to use kpse. We had the code anyway.
+--
+-- mtxrun --script kpse --progname=pdftex --findfile context.mkii
+
+trackers.enable("resolvers.lib.silent")
+
+local kpse = LUATEXENGINE == "luametatex" and require("libs-imp-kpse")
+
+if type(kpse) ~= "table" then
+    return
+end
+
+local helpinfo = [[
+<?xml version="1.0"?>
+<application>
+ <metadata>
+  <entry name="name">mtx-kpse</entry>
+  <entry name="detail">ConTeXt KPSE checking utility</entry>
+  <entry name="version">1.00</entry>
+ </metadata>
+ <flags>
+  <category name="basic">
+   <subcategory>
+    <flag name="progname"><short>mandate, set the program name (e.g. pdftex)</short></flag>
+    <flag name="findfile"><short>report the fully qualified path of the given file</short></flag>
+    <flag name="expandpath"><short>expand the given path variable</short></flag>
+    <flag name="expandvar"><short>expand a variable</short></flag>
+    <flag name="expandbraces"><short>expand a complex variable specification</short></flag>
+    <flag name="varvalue"><short>show the value of a variable</short></flag>
+    <flag name="readablefile"><short>report if a file is readable</short></flag>
+    <flag name="filetypes"><short>list all supported formats</short></flag>
+   </subcategory>
+   <subcategory>
+    <flag name="fonts"><short>only wipe fonts</short></flag>
+   </subcategory>
+  </category>
+ </flags>
+</application>
+]]
+
+local application = logs.application {
+    name     = "mtx-kpse",
+    banner   = "ConTeXt KPSE checking utility",
+    helpinfo = helpinfo,
+}
+
+local report   = application.report
+local argument = environment.argument
+local target   = environment.files[1]
+
+if argument("progname") or argument("programname") then
+    kpse.set_program_name(argument("progname"))
+else
+    application.help()
+    return
+end
+
+if argument("exporthelp") then
+    application.export(environment.argument("exporthelp"),target)
+elseif argument("filetypes") or argument("formats") then
+    print(table.concat(kpse.get_file_types()," "))
+elseif type(target) == "string" and target ~= "" then
+    if argument("findfile") or argument("find-file") then
+        print(kpse.find_file(target,argument("format")))
+    elseif argument("expandpath") or argument("expand-path") then
+        print(kpse.expand_path(target))
+    elseif argument("expandvar") or argument("expand-var") then
+        print(kpse.expand_var(target))
+    elseif argument("expandbraces") or argument("expand-braces") then
+        print(kpse.expand_braces(target))
+    elseif argument("varvalue") or argument("var-value") then
+        print(kpse.var_value(target))
+    elseif argument("readablefile") or argument("readable-file") then
+        print(kpse.readable_file(target))
+    else
+        application.help()
+    end
+else
+    application.help()
+end
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 0dddd1c21..b683bc729 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -5741,10 +5741,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-unicode"] = package.loaded["l-unicode"] or true
 
--- original size: 41281, stripped down to: 17261
+-- original size: 41303, stripped down to: 17277
 
 if not modules then modules={} end modules ['l-unicode']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8209,10 +8210,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 11530, stripped down to: 9007
+-- original size: 11552, stripped down to: 9023
 
 if not modules then modules={} end modules ['util-fil']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8577,10 +8579,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 12946, stripped down to: 9507
+-- original size: 12968, stripped down to: 9523
 
 if not modules then modules={} end modules ['util-sac']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -19344,7 +19347,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 33747, stripped down to: 20989
+-- original size: 33708, stripped down to: 20953
 
 if not modules then modules={} end modules ['lxml-aux']={
  version=1.001,
@@ -19839,7 +19842,6 @@ local e_stripper=lpegpatterns.e_stripper
 local x_stripper=lpegpatterns.x_stripper
 local function stripelement(e,nolines,anywhere,everything)
  local edt=e.dt
- print(nolines,anywhere,everything)
  if edt then
   local n=#edt
   if n==0 then
@@ -25628,7 +25630,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["libs-ini"] = package.loaded["libs-ini"] or true
 
--- original size: 5822, stripped down to: 3629
+-- original size: 5950, stripped down to: 3737
 
 if not modules then modules={} end modules ['libs-ini']={
  version=1.001,
@@ -25648,7 +25650,9 @@ local findfile=resolvers.findfile
 local expandpaths=resolvers.expandedpathlistfromvariable
 local report=logs.reporter("resolvers","libraries")
 local trace=false
+local silent=false
 trackers.register("resolvers.lib",function(v) trace=v end)
+trackers.register("resolvers.lib.silent",function(v) silent=v end)
 local function findlib(required) 
  local suffix=os.libsuffix or "so"
  if not qualifiedpath(required) then
@@ -25749,10 +25753,10 @@ function libraries.optionalloaded(name,libnames)
      end
     end
     local initialized=thelib_initialize(unpack(libnames))
-    if initialized then
-     report("using library '% + t'",libnames)
-    else
+    if not initialized then
      report("unable to initialize library '% + t'",libnames)
+    elseif not silent then
+     report("using library '% + t'",libnames)
     end
     return initialized
    end
@@ -26211,8 +26215,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1041734
--- stripped bytes    : 411240
+-- original bytes    : 1041889
+-- stripped bytes    : 411275
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 0dddd1c21..b683bc729 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -5741,10 +5741,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-unicode"] = package.loaded["l-unicode"] or true
 
--- original size: 41281, stripped down to: 17261
+-- original size: 41303, stripped down to: 17277
 
 if not modules then modules={} end modules ['l-unicode']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8209,10 +8210,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 11530, stripped down to: 9007
+-- original size: 11552, stripped down to: 9023
 
 if not modules then modules={} end modules ['util-fil']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8577,10 +8579,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 12946, stripped down to: 9507
+-- original size: 12968, stripped down to: 9523
 
 if not modules then modules={} end modules ['util-sac']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -19344,7 +19347,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 33747, stripped down to: 20989
+-- original size: 33708, stripped down to: 20953
 
 if not modules then modules={} end modules ['lxml-aux']={
  version=1.001,
@@ -19839,7 +19842,6 @@ local e_stripper=lpegpatterns.e_stripper
 local x_stripper=lpegpatterns.x_stripper
 local function stripelement(e,nolines,anywhere,everything)
  local edt=e.dt
- print(nolines,anywhere,everything)
  if edt then
   local n=#edt
   if n==0 then
@@ -25628,7 +25630,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["libs-ini"] = package.loaded["libs-ini"] or true
 
--- original size: 5822, stripped down to: 3629
+-- original size: 5950, stripped down to: 3737
 
 if not modules then modules={} end modules ['libs-ini']={
  version=1.001,
@@ -25648,7 +25650,9 @@ local findfile=resolvers.findfile
 local expandpaths=resolvers.expandedpathlistfromvariable
 local report=logs.reporter("resolvers","libraries")
 local trace=false
+local silent=false
 trackers.register("resolvers.lib",function(v) trace=v end)
+trackers.register("resolvers.lib.silent",function(v) silent=v end)
 local function findlib(required) 
  local suffix=os.libsuffix or "so"
  if not qualifiedpath(required) then
@@ -25749,10 +25753,10 @@ function libraries.optionalloaded(name,libnames)
      end
     end
     local initialized=thelib_initialize(unpack(libnames))
-    if initialized then
-     report("using library '% + t'",libnames)
-    else
+    if not initialized then
      report("unable to initialize library '% + t'",libnames)
+    elseif not silent then
+     report("using library '% + t'",libnames)
     end
     return initialized
    end
@@ -26211,8 +26215,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1041734
--- stripped bytes    : 411240
+-- original bytes    : 1041889
+-- stripped bytes    : 411275
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 0dddd1c21..b683bc729 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -5741,10 +5741,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-unicode"] = package.loaded["l-unicode"] or true
 
--- original size: 41281, stripped down to: 17261
+-- original size: 41303, stripped down to: 17277
 
 if not modules then modules={} end modules ['l-unicode']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8209,10 +8210,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 11530, stripped down to: 9007
+-- original size: 11552, stripped down to: 9023
 
 if not modules then modules={} end modules ['util-fil']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8577,10 +8579,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 12946, stripped down to: 9507
+-- original size: 12968, stripped down to: 9523
 
 if not modules then modules={} end modules ['util-sac']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -19344,7 +19347,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 33747, stripped down to: 20989
+-- original size: 33708, stripped down to: 20953
 
 if not modules then modules={} end modules ['lxml-aux']={
  version=1.001,
@@ -19839,7 +19842,6 @@ local e_stripper=lpegpatterns.e_stripper
 local x_stripper=lpegpatterns.x_stripper
 local function stripelement(e,nolines,anywhere,everything)
  local edt=e.dt
- print(nolines,anywhere,everything)
  if edt then
   local n=#edt
   if n==0 then
@@ -25628,7 +25630,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["libs-ini"] = package.loaded["libs-ini"] or true
 
--- original size: 5822, stripped down to: 3629
+-- original size: 5950, stripped down to: 3737
 
 if not modules then modules={} end modules ['libs-ini']={
  version=1.001,
@@ -25648,7 +25650,9 @@ local findfile=resolvers.findfile
 local expandpaths=resolvers.expandedpathlistfromvariable
 local report=logs.reporter("resolvers","libraries")
 local trace=false
+local silent=false
 trackers.register("resolvers.lib",function(v) trace=v end)
+trackers.register("resolvers.lib.silent",function(v) silent=v end)
 local function findlib(required) 
  local suffix=os.libsuffix or "so"
  if not qualifiedpath(required) then
@@ -25749,10 +25753,10 @@ function libraries.optionalloaded(name,libnames)
      end
     end
     local initialized=thelib_initialize(unpack(libnames))
-    if initialized then
-     report("using library '% + t'",libnames)
-    else
+    if not initialized then
      report("unable to initialize library '% + t'",libnames)
+    elseif not silent then
+     report("using library '% + t'",libnames)
     end
     return initialized
    end
@@ -26211,8 +26215,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1041734
--- stripped bytes    : 411240
+-- original bytes    : 1041889
+-- stripped bytes    : 411275
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 0dddd1c21..b683bc729 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -5741,10 +5741,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-unicode"] = package.loaded["l-unicode"] or true
 
--- original size: 41281, stripped down to: 17261
+-- original size: 41303, stripped down to: 17277
 
 if not modules then modules={} end modules ['l-unicode']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8209,10 +8210,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 11530, stripped down to: 9007
+-- original size: 11552, stripped down to: 9023
 
 if not modules then modules={} end modules ['util-fil']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -8577,10 +8579,11 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 12946, stripped down to: 9507
+-- original size: 12968, stripped down to: 9523
 
 if not modules then modules={} end modules ['util-sac']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -19344,7 +19347,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 33747, stripped down to: 20989
+-- original size: 33708, stripped down to: 20953
 
 if not modules then modules={} end modules ['lxml-aux']={
  version=1.001,
@@ -19839,7 +19842,6 @@ local e_stripper=lpegpatterns.e_stripper
 local x_stripper=lpegpatterns.x_stripper
 local function stripelement(e,nolines,anywhere,everything)
  local edt=e.dt
- print(nolines,anywhere,everything)
  if edt then
   local n=#edt
   if n==0 then
@@ -25628,7 +25630,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["libs-ini"] = package.loaded["libs-ini"] or true
 
--- original size: 5822, stripped down to: 3629
+-- original size: 5950, stripped down to: 3737
 
 if not modules then modules={} end modules ['libs-ini']={
  version=1.001,
@@ -25648,7 +25650,9 @@ local findfile=resolvers.findfile
 local expandpaths=resolvers.expandedpathlistfromvariable
 local report=logs.reporter("resolvers","libraries")
 local trace=false
+local silent=false
 trackers.register("resolvers.lib",function(v) trace=v end)
+trackers.register("resolvers.lib.silent",function(v) silent=v end)
 local function findlib(required) 
  local suffix=os.libsuffix or "so"
  if not qualifiedpath(required) then
@@ -25749,10 +25753,10 @@ function libraries.optionalloaded(name,libnames)
      end
     end
     local initialized=thelib_initialize(unpack(libnames))
-    if initialized then
-     report("using library '% + t'",libnames)
-    else
+    if not initialized then
      report("unable to initialize library '% + t'",libnames)
+    elseif not silent then
+     report("using library '% + t'",libnames)
     end
     return initialized
    end
@@ -26211,8 +26215,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1041734
--- stripped bytes    : 411240
+-- original bytes    : 1041889
+-- stripped bytes    : 411275
 
 -- end library merge
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 787c827ac..6a5882366 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2020.07.09 14:48}
+\newcontextversion{2020.07.13 16:23}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index cb34f163c..b087acf4f 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.09 14:48}
+\edef\contextversion{2020.07.13 16:23}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/back-lua.lua b/tex/context/base/mkiv/back-lua.lua
index 4e95d37e3..87093afd4 100644
--- a/tex/context/base/mkiv/back-lua.lua
+++ b/tex/context/base/mkiv/back-lua.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['back-lua'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/back-mps.lua b/tex/context/base/mkiv/back-mps.lua
index 96c850ed6..13a0d6d42 100644
--- a/tex/context/base/mkiv/back-mps.lua
+++ b/tex/context/base/mkiv/back-mps.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['back-mps'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/buff-ini.lua b/tex/context/base/mkiv/buff-ini.lua
index b4290f8b1..4589e5498 100644
--- a/tex/context/base/mkiv/buff-ini.lua
+++ b/tex/context/base/mkiv/buff-ini.lua
@@ -44,7 +44,7 @@ local gettoken          = getters.token
 
 local getcommand        = token.get_command
 local getcsname         = token.get_csname
-local getnextchar       = token.get_next_char
+local getnextchar       = token.scan_next_char or token.get_next_char
 
 local variables         = interfaces.variables
 local settings_to_array = utilities.parsers.settings_to_array
diff --git a/tex/context/base/mkiv/cldf-int.lua b/tex/context/base/mkiv/cldf-int.lua
index d869f3154..47f825a4a 100644
--- a/tex/context/base/mkiv/cldf-int.lua
+++ b/tex/context/base/mkiv/cldf-int.lua
@@ -35,7 +35,7 @@ if CONTEXTLMTXMODE > 0 then
     local scanners  = tokens.scanners
     local shortcuts = tokens.shortcuts
 
-    local scanpeek  = scanners.peek
+    local peekchar  = scanners.peekchar
     local scankey   = scanners.key
     local scanvalue = scanners.value
     local scanskip  = scanners.skip
@@ -46,11 +46,11 @@ if CONTEXTLMTXMODE > 0 then
     local comma     = byte(',')
 
     function scanhash(scanners)
-        if scanpeek() == open then
+        if peekchar() == open then
             local data = { }
             scanskip()
             while true do
-                local c = scanpeek()
+                local c = peekchar()
                 if c == comma then
                     scanskip()
                 elseif c == close then
@@ -59,7 +59,7 @@ if CONTEXTLMTXMODE > 0 then
                 else
                     local key = scankey(equal)
                     if key then
-                        if scanpeek() == equal then
+                        if peekchar() == equal then
                             scanskip()
                             if scanners then
                                 local scanner = scanners[key]
@@ -84,12 +84,12 @@ if CONTEXTLMTXMODE > 0 then
     end
 
     function scanarray()
-        if scanpeek() == open then
+        if peekchar() == open then
             local data = { }
             local d = 0
             scanskip()
             while true do
-                local c = scanpeek()
+                local c = peekchar()
                 if c == comma then
                     scanskip()
                 elseif c == close then
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 4b09e1699..f41893ad6 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.07.09 14:48}
+\newcontextversion{2020.07.13 16:23}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index f2fc78609..4ce7764ff 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.09 14:48}
+\edef\contextversion{2020.07.13 16:23}
 
 %D Kind of special:
 
@@ -160,7 +160,7 @@
 
 % \loadmarkfile{luat-ini}
 
-\loadmarkfile{toks-tra}
+%loadmarkfile{toks-tra}
 \loadmarkfile{toks-aux}
 %loadmarkfile{toks-map} % obsolete, never used
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 6af3d0f0b..9f3235584 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.07.09 14:48}
+\edef\contextversion{2020.07.13 16:23}
 
 %D Kind of special:
 
@@ -144,11 +144,7 @@
 
 \loadmarkfile{trac-ctx} % maybe move up
 
-% \loadmarkfile{luat-ini}
-
-\loadmarkfile{toks-tra}
 \loadmarkfile{toks-aux}
-%loadmarkfile{toks-map} % obsolete, never used
 
 \loadmarkfile{attr-ini}
 
diff --git a/tex/context/base/mkiv/driv-shp.lua b/tex/context/base/mkiv/driv-shp.lua
index 471fa92f0..a23cca3a8 100644
--- a/tex/context/base/mkiv/driv-shp.lua
+++ b/tex/context/base/mkiv/driv-shp.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['driv-shp'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to driv-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-cff.lua b/tex/context/base/mkiv/font-cff.lua
index 627847efa..c2cf0e699 100644
--- a/tex/context/base/mkiv/font-cff.lua
+++ b/tex/context/base/mkiv/font-cff.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-cff'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index f8794bcde..0cff896e8 100644
--- a/tex/context/base/mkiv/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-dsp'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua
index 84a28a8b7..990a561f9 100644
--- a/tex/context/base/mkiv/font-map.lua
+++ b/tex/context/base/mkiv/font-map.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-map'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-nod.lua b/tex/context/base/mkiv/font-nod.lua
index 8c0f6e441..ad61d7111 100644
--- a/tex/context/base/mkiv/font-nod.lua
+++ b/tex/context/base/mkiv/font-nod.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-nod'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-one.lua b/tex/context/base/mkiv/font-one.lua
index 5387516b4..a76c92985 100644
--- a/tex/context/base/mkiv/font-one.lua
+++ b/tex/context/base/mkiv/font-one.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-one'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-onr.lua b/tex/context/base/mkiv/font-onr.lua
index fc6bead58..c33b09f9e 100644
--- a/tex/context/base/mkiv/font-onr.lua
+++ b/tex/context/base/mkiv/font-onr.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-onr'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-otd.lua b/tex/context/base/mkiv/font-otd.lua
index 2633c6cae..3f1b212db 100644
--- a/tex/context/base/mkiv/font-otd.lua
+++ b/tex/context/base/mkiv/font-otd.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-otd'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua
index bec52d813..bb02044dc 100644
--- a/tex/context/base/mkiv/font-otj.lua
+++ b/tex/context/base/mkiv/font-otj.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-otj'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-lib.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua
index bad42054f..119687f12 100644
--- a/tex/context/base/mkiv/font-otr.lua
+++ b/tex/context/base/mkiv/font-otr.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-otr'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index 86101ee24..490f28de6 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-ots'] = { -- sequences
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
@@ -252,6 +253,9 @@ local math_code          = nodecodes.math
 local dir_code           = nodecodes.dir
 local localpar_code      = nodecodes.localpar
 
+local lefttoright_code   = nodes.dirvalues.lefttoright
+local righttoleft_code   = nodes.dirvalues.righttoleft
+
 local discretionarydisc_code = disccodes.discretionary
 local ligatureglyph_code     = glyphcodes.ligature
 
@@ -3625,8 +3629,6 @@ end
 local txtdirstate, pardirstate  do -- this might change (no need for nxt in pardirstate)
 
     local getdirection = nuts.getdirection
-    local lefttoright  = 0
-    local righttoleft  = 1
 
     txtdirstate = function(start,stack,top,rlparmode)
         local dir, pop = getdirection(start)
@@ -3635,19 +3637,19 @@ local txtdirstate, pardirstate  do -- this might change (no need for nxt in pard
                 return 0, rlparmode
             else
                 top = top - 1
-                if stack[top] == righttoleft then
+                if stack[top] == righttoleft_code then
                     return top, -1
                 else
                     return top, 1
                 end
             end
-        elseif dir == lefttoright then
+        elseif dir == lefttoright_code then
             top = top + 1
-            stack[top] = lefttoright
+            stack[top] = lefttoright_code
             return top, 1
-        elseif dir == righttoleft then
+        elseif dir == righttoleft_code then
             top = top + 1
-            stack[top] = righttoleft
+            stack[top] = righttoleft_code
             return top, -1
         else
             return top, rlparmode
@@ -3656,14 +3658,9 @@ local txtdirstate, pardirstate  do -- this might change (no need for nxt in pard
 
     pardirstate = function(start)
         local dir = getdirection(start)
-        if dir == lefttoright then
-            return 1, 1
-        elseif dir == righttoleft then
-            return -1, -1
-        -- for old times sake we we handle strings too
-        elseif dir == "TLT" then
+        if dir == lefttoright_code then
             return 1, 1
-        elseif dir == "TRT" then
+        elseif dir == righttoleft_code then
             return -1, -1
         else
             return 0, 0
@@ -3764,7 +3761,7 @@ do
 
         if getid(head) == localpar_code and start_of_par(head) then
             initialrl = pardirstate(head)
-        elseif direction == 1 or direction == "TRT" then
+        elseif direction == righttoleft_code then
             initialrl = -1
         end
 
@@ -4059,7 +4056,7 @@ do
         local done      = false
         local dirstack  = { nil } -- could move outside function but we can have local runs (maybe a few more nils)
         local start     = head
-        local initialrl = (direction == 1 or direction == "TRT") and -1 or 0
+        local initialrl = (direction == righttoleft_code) and -1 or 0
         local rlmode    = initialrl
         local rlparmode = initialrl
         local topstack  = 0
diff --git a/tex/context/base/mkiv/font-sol.lua b/tex/context/base/mkiv/font-sol.lua
index 2017afcb2..643080788 100644
--- a/tex/context/base/mkiv/font-sol.lua
+++ b/tex/context/base/mkiv/font-sol.lua
@@ -111,6 +111,8 @@ local whatsit_code       = nodecodes.whatsit
 
 local fontkern_code      = kerncodes.fontkern
 
+local righttoleft_code   = nodes.dirvalues.righttoleft
+
 local userdefinedwhatsit_code = whatsitcodes.userdefined
 
 local nodeproperties     = nodes.properties.data
@@ -379,7 +381,7 @@ function splitters.split(head) -- best also pass the direction
             end
         end
         if r2l then
-            local dirnode = new_direction(righttoleft) -- brrr, we don't pop ... to be done (when used at all)
+            local dirnode = new_direction(righttoleft_code) -- brrr, we don't pop ... to be done (when used at all)
             setlink(dirnode,list)
             list = dirnode
         end
@@ -434,13 +436,13 @@ function splitters.split(head) -- best also pass the direction
                 flush()
             end
             local direction, pop = getdirection(current)
-            r2l = not pop and direction == righttoleft
+            r2l = not pop and direction == righttoleft_code
         elseif id == localpar_code and start_of_par(current) then
             if start then
                 flush() -- very unlikely as this starts a paragraph
             end
             local direction = getdirection(current)
-            r2l = direction == righttoleft or direction == "TRT" -- for old times sake
+            r2l = direction == righttoleft_code
         else
             if start then
                 flush()
diff --git a/tex/context/base/mkiv/font-tpk.lua b/tex/context/base/mkiv/font-tpk.lua
index 05ecdd45c..c24af1df8 100644
--- a/tex/context/base/mkiv/font-tpk.lua
+++ b/tex/context/base/mkiv/font-tpk.lua
@@ -1,5 +1,6 @@
-    if not modules then modules = { } end modules ['font-tpk'] = {
+if not modules then modules = { } end modules ['font-tpk'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-lib.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/font-ttf.lua b/tex/context/base/mkiv/font-ttf.lua
index 651ede17e..865f8e6e3 100644
--- a/tex/context/base/mkiv/font-ttf.lua
+++ b/tex/context/base/mkiv/font-ttf.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['font-ttf'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to font-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua
index a59ac8ac2..508f3247a 100644
--- a/tex/context/base/mkiv/grph-inc.lua
+++ b/tex/context/base/mkiv/grph-inc.lua
@@ -1377,7 +1377,6 @@ function figures.dummy(data)
     du.width   = du.width  or figures.defaultwidth
     du.height  = du.height or figures.defaultheight
     du.depth   = du.depth  or figures.defaultdepth
- -- box.dir    = "TLT"
     box.width  = du.width
     box.height = du.height
     box.depth  = du.depth
diff --git a/tex/context/base/mkiv/l-unicode.lua b/tex/context/base/mkiv/l-unicode.lua
index c57aaf33e..03016ed90 100644
--- a/tex/context/base/mkiv/l-unicode.lua
+++ b/tex/context/base/mkiv/l-unicode.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['l-unicode'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to luat-lib.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/libs-imp-kpse.lua b/tex/context/base/mkiv/libs-imp-kpse.lua
new file mode 100644
index 000000000..f8e4a9907
--- /dev/null
+++ b/tex/context/base/mkiv/libs-imp-kpse.lua
@@ -0,0 +1,58 @@
+if not modules then modules = { } end modules ['libs-imp-kpse'] = {
+    version   = 1.001,
+    comment   = "companion to luat-imp-kpse.mkxl",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+-- This is an experiment. It might make sense to have this available in case I want
+-- more runners to use LuaMetaTeX in which case (as with mtxrun using LuaTeX) we
+-- need to load kpse.
+
+local libname = "kpse"
+local libfile = (os.platform == "win64" and "kpathsea*w64")
+             or (os.platform == "win32" and "kpathsea*w32")
+             or "libkpathsea"
+local libkpse = resolvers.libraries.validoptional(libname)
+
+if package.loaded[libname] then
+    return package.loaded[libname]
+end
+
+-- This is a variant that loaded directly:
+
+-- kpse = libkpse -- the library will issue warnings anyway
+--
+-- resolvers.libraries.optionalloaded(libname,libfile) -- no need to chedk if true
+
+-- This variant delays loading and has a bit more protection:
+
+local function okay()
+    if libkpse and resolvers.libraries.optionalloaded(libname,libfile) then
+        okay = function() return true end
+    else
+        okay = function() return false end
+    end
+    return okay()
+end
+
+local kpse = { }
+
+for k, v in next, libkpse do
+    kpse[k] = function(...) if okay() then return v(...) end end
+end
+
+-- We properly register the module:
+
+package.loaded[libname] = kpse
+
+optional.loaded.kpse = kpse
+
+-- A simple test:
+
+-- kpse.set_program_name("pdftex")
+-- print("find file:",kpse.find_file("oeps.tex"))
+-- print("find file:",kpse.find_file("context.mkii"))
+
+return kpse
diff --git a/tex/context/base/mkiv/libs-imp-kpse.mkxl b/tex/context/base/mkiv/libs-imp-kpse.mkxl
new file mode 100644
index 000000000..8a3d7826f
--- /dev/null
+++ b/tex/context/base/mkiv/libs-imp-kpse.mkxl
@@ -0,0 +1,38 @@
+%D \module
+%D   [       file=libs-imp-kpse,
+%D        version=2020.05.19,
+%D          title=\CONTEXT\ System Modules,
+%D       subtitle=KPSE File Searching,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This is not really a module. It's more some left over from an experiment. Who
+%D know when it comes in handy; probably never in a real run, but I might want to
+%D make a \LUAMETATEX\ plain format one day, just for the fun of it.
+
+% \registerctxluafile{libs-imp-kpse}{}
+
+\continueifinputfile{libs-imp-kpse.mkxl}
+
+\starttext
+
+\startTEXpage
+    \startluacode
+        local kpse = require("libs-imp-kpse")
+
+        kpse.set_program_name("pdftex")
+
+        local name = "context.mkii"
+
+        context("%s: %s",name,kpse.find_file(name))
+    \stopluacode
+\stopTEXpage
+
+\stoptext
+
+
diff --git a/tex/context/base/mkiv/libs-ini.lua b/tex/context/base/mkiv/libs-ini.lua
index 2bac3201d..5fc8ded98 100644
--- a/tex/context/base/mkiv/libs-ini.lua
+++ b/tex/context/base/mkiv/libs-ini.lua
@@ -30,8 +30,10 @@ local expandpaths   = resolvers.expandedpathlistfromvariable
 
 local report        = logs.reporter("resolvers","libraries")
 local trace         = false
+local silent        = false
 
-trackers.register("resolvers.lib", function(v) trace = v end)
+trackers.register("resolvers.lib",        function(v) trace  = v end)
+trackers.register("resolvers.lib.silent", function(v) silent = v end)
 
 local function findlib(required) -- todo: cache
     local suffix = os.libsuffix or "so"
@@ -143,10 +145,10 @@ function libraries.optionalloaded(name,libnames)
                     end
                 end
                 local initialized = thelib_initialize(unpack(libnames))
-                if initialized then
-                    report("using library '% + t'",libnames)
-                else
+                if not initialized then
                     report("unable to initialize library '% + t'",libnames)
+                elseif not silent then
+                    report("using library '% + t'",libnames)
                 end
                 return initialized
             end
diff --git a/tex/context/base/mkiv/lpdf-emb.lua b/tex/context/base/mkiv/lpdf-emb.lua
index 4ffcfd8a8..0f0388af0 100644
--- a/tex/context/base/mkiv/lpdf-emb.lua
+++ b/tex/context/base/mkiv/lpdf-emb.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['lpdf-ini'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/lpdf-eng.lua b/tex/context/base/mkiv/lpdf-eng.lua
index 21c7e66e9..26a63e9a0 100644
--- a/tex/context/base/mkiv/lpdf-eng.lua
+++ b/tex/context/base/mkiv/lpdf-eng.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['lpdf-eng'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/lpdf-img.lua b/tex/context/base/mkiv/lpdf-img.lua
index 17305a1cf..fc53740f6 100644
--- a/tex/context/base/mkiv/lpdf-img.lua
+++ b/tex/context/base/mkiv/lpdf-img.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['lpdf-img'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index c6dd4765e..8ece39cee 100644
--- a/tex/context/base/mkiv/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['lpdf-ini'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/lpdf-lmt.lua b/tex/context/base/mkiv/lpdf-lmt.lua
index 90e1fcea2..5a1a6bc44 100644
--- a/tex/context/base/mkiv/lpdf-lmt.lua
+++ b/tex/context/base/mkiv/lpdf-lmt.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['lpdf-lmt'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to lpdf-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/lxml-aux.lua b/tex/context/base/mkiv/lxml-aux.lua
index f93d472ea..126df4d82 100644
--- a/tex/context/base/mkiv/lxml-aux.lua
+++ b/tex/context/base/mkiv/lxml-aux.lua
@@ -566,7 +566,6 @@ local x_stripper   = lpegpatterns.x_stripper
 
 local function stripelement(e,nolines,anywhere,everything)
     local edt = e.dt
-    print(nolines,anywhere,everything)
     if edt then
         local n = #edt
         if n == 0 then
diff --git a/tex/context/base/mkiv/math-map.lua b/tex/context/base/mkiv/math-map.lua
index 2233722a0..97860b923 100644
--- a/tex/context/base/mkiv/math-map.lua
+++ b/tex/context/base/mkiv/math-map.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['math-map'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to math-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 4b009bfa1..188363847 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['math-noa'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to math-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/mlib-cnt.lua b/tex/context/base/mkiv/mlib-cnt.lua
index 761eac655..667384ed7 100644
--- a/tex/context/base/mkiv/mlib-cnt.lua
+++ b/tex/context/base/mkiv/mlib-cnt.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['mlib-cnt'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to mlib-ctx.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/mlib-svg.lua b/tex/context/base/mkiv/mlib-svg.lua
index 2a1b476ae..4c4122476 100644
--- a/tex/context/base/mkiv/mlib-svg.lua
+++ b/tex/context/base/mkiv/mlib-svg.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['mlib-svg'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to mlib-ctx.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 7ec4e6a54..b0d2bf2fc 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -298,6 +298,7 @@ return {
         "quitcondition", "truecondition", "falsecondition",
         --
         "tracingall", "tracingnone", "loggingall",
+        "showluatokens",
         --
         "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to",
         --
diff --git a/tex/context/base/mkiv/node-bck.lua b/tex/context/base/mkiv/node-bck.lua
index 53ace65e9..82c800de8 100644
--- a/tex/context/base/mkiv/node-bck.lua
+++ b/tex/context/base/mkiv/node-bck.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-bck'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-bck.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/node-cmp.lua b/tex/context/base/mkiv/node-cmp.lua
index 18b939999..e9e7e266d 100644
--- a/tex/context/base/mkiv/node-cmp.lua
+++ b/tex/context/base/mkiv/node-cmp.lua
@@ -7,7 +7,7 @@ if not modules then modules = { } end modules ['node-cmp'] = {
 }
 
 -- This is a LuaTeX compatibility module. The code below is no longer
--- present node-met or node-aux. These functions are rarely used.
+-- present in node-met or node-aux. These functions are rarely used.
 
 if node.count then
     return
diff --git a/tex/context/base/mkiv/node-fin.lua b/tex/context/base/mkiv/node-fin.lua
index a67ec5905..ddcdcd9d0 100644
--- a/tex/context/base/mkiv/node-fin.lua
+++ b/tex/context/base/mkiv/node-fin.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-fin'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-fin.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/node-ini.lua b/tex/context/base/mkiv/node-ini.lua
index 8ebec4a1c..0b048d0e3 100644
--- a/tex/context/base/mkiv/node-ini.lua
+++ b/tex/context/base/mkiv/node-ini.lua
@@ -83,14 +83,22 @@ local fillcodes     = mark(getsubtypes("fill"))
 local boundarycodes = mark(getsubtypes("boundary"))
 local penaltycodes  = mark(getsubtypes("penalty"))
 local kerncodes     = mark(getsubtypes("kern"))
-local margincodes   = CONTEXTLMTXMODE == 0 and mark(getsubtypes("marginkern")) or { }
+local margincodes   = CONTEXTLMTXMODE > 0 and { }
 local mathcodes     = mark(getsubtypes("math"))
 local noadcodes     = mark(getsubtypes("noad"))
 local radicalcodes  = mark(getsubtypes("radical"))
 local accentcodes   = mark(getsubtypes("accent"))
 local fencecodes    = mark(getsubtypes("fence"))
 ----- fractioncodes = mark(getsubtypes("fraction"))
-local localparcodes = allocate { [0] = "new_graf", "local_box", "hmode_par", "penalty", "math" } -- only in luametatex now
+local localparcodes = CONTEXTLMTXMODE > 0 and mark(getsubtypes("localpar"))
+
+if not margincodes then
+    margincodes = mark(getsubtypes("marginkern"))
+end
+
+if not localparcodes then
+    localparcodes = allocate { [0] = "new_graf", "local_box", "hmode_par", "penalty", "math" }
+end
 
 local function simplified(t)
     local r = { }
@@ -104,13 +112,13 @@ local nodecodes = simplified(node.types())
 local whatcodes = simplified(node.whatsits and node.whatsits() or { })
 
 local usercodes = allocate {
-    [ 97] = "attribute",  -- a
-    [100] = "number",     -- d
-    [102] = "float",      -- f
-    [108] = "lua",        -- l
-    [110] = "node",       -- n
-    [115] = "string",     -- s
-    [116] = "token"       -- t
+    [ 97] = "attribute", -- a
+    [100] = "number",    -- d
+    [102] = "float",     -- f
+    [108] = "lua",       -- l
+    [110] = "node",      -- n
+    [115] = "string",    -- s
+    [116] = "token"      -- t
 }
 
 local noadoptions = allocate {
@@ -125,24 +133,11 @@ local noadoptions = allocate {
     right    = 0x14 + 0x08,
 }
 
--- local directionvalues  = mark(getvalues("dir"))
--- local gluevalues       = mark(getvalues("glue"))
--- local literalvalues    = mark(getvalues("literal"))
-
-local dirvalues = allocate {
-    [0] = "TLT",
-    [1] = "TRT",
-    [2] = "LTL",
-    [3] = "RTT",
-}
+local dirvalues = CONTEXTLMTXMODE > 0 and mark(getvalues("dir"))
 
-local gluevalues = allocate {
-    [0] = "normal",
-    [1] = "fi",
-    [2] = "fil",
-    [3] = "fill",
-    [4] = "filll",
-}
+if not dirvalues then
+    dirvalues = allocate { [0] = "lefttoright", [1] = "righttoleft" }
+end
 
 local literalvalues = allocate {
     [0] = "origin",
@@ -154,6 +149,8 @@ local literalvalues = allocate {
     [6] = "special",
 }
 
+local gluevalues = mark(getvalues("glue"))
+
 gluecodes        = allocate(swapped(gluecodes,gluecodes))
 dircodes         = allocate(swapped(dircodes,dircodes))
 boundarycodes    = allocate(swapped(boundarycodes,boundarycodes))
@@ -232,9 +229,6 @@ nodes.dirvalues            = dirvalues
 nodes.gluevalues           = gluevalues
 nodes.literalvalues        = literalvalues
 
-dirvalues.lefttoright = 0
-dirvalues.righttoleft = 1
-
 nodes.subtypes = allocate {
     [nodecodes.accent]     = accentcodes,
     [nodecodes.boundary]   = boundarycodes,
@@ -267,14 +261,16 @@ table.setmetatableindex(nodes.subtypes,function(t,k)
     return v
 end)
 
-nodes.skipcodes            = gluecodes     -- more friendly
-nodes.directioncodes       = dircodes      -- more friendly
-nodes.whatsitcodes         = whatcodes     -- more official
+-- a few more friendly aliases:
+
+nodes.skipcodes            = gluecodes
+nodes.directioncodes       = dircodes
+nodes.whatsitcodes         = whatcodes
 nodes.marginkerncodes      = margincodes
 nodes.discretionarycodes   = disccodes
-nodes.directionvalues      = dirvalues     -- more friendly
-nodes.skipvalues           = gluevalues    -- more friendly
-nodes.literalvalues        = literalvalues -- more friendly
+nodes.directionvalues      = dirvalues
+nodes.skipvalues           = gluevalues
+nodes.literalvalues        = literalvalues
 
 glyphcodes.glyph           = glyphcodes.character
 
diff --git a/tex/context/base/mkiv/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua
index a85bdfe01..709ef2b95 100644
--- a/tex/context/base/mkiv/node-ltp.lua
+++ b/tex/context/base/mkiv/node-ltp.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-par'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-par.mkiv",
     author    = "Hans Hagen",
     copyright = "ConTeXt Development Team",
@@ -259,7 +260,6 @@ local nodepool                = nuts.pool
 
 local nodecodes               = nodes.nodecodes
 local kerncodes               = nodes.kerncodes
-local margincodes             = nodes.margincodes
 local disccodes               = nodes.disccodes
 local mathcodes               = nodes.mathcodes
 local fillcodes               = nodes.fillcodes
@@ -294,9 +294,6 @@ local italickern_code         = kerncodes.italiccorrection
 local fontkern_code           = kerncodes.fontkern
 local accentkern_code         = kerncodes.accentkern
 
-local leftmargin_code         = margincodes.left
------ rightmargin_code        = margincodes.right
-
 local automaticdisc_code      = disccodes.automatic
 local regulardisc_code        = disccodes.regular
 local firstdisc_code          = disccodes.first
diff --git a/tex/context/base/mkiv/node-ref.lua b/tex/context/base/mkiv/node-ref.lua
index ac43a84a3..2e035b2e0 100644
--- a/tex/context/base/mkiv/node-ref.lua
+++ b/tex/context/base/mkiv/node-ref.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-ref'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-ref.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/node-rul.lua b/tex/context/base/mkiv/node-rul.lua
index b904e54d6..830d97ff6 100644
--- a/tex/context/base/mkiv/node-rul.lua
+++ b/tex/context/base/mkiv/node-rul.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-rul'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-rul.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/node-shp.lua b/tex/context/base/mkiv/node-shp.lua
index 7af789b1b..58dc94495 100644
--- a/tex/context/base/mkiv/node-shp.lua
+++ b/tex/context/base/mkiv/node-shp.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['node-shp'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to node-ini.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/pack-rul.lua b/tex/context/base/mkiv/pack-rul.lua
index 5c3c10348..8e410f0cf 100644
--- a/tex/context/base/mkiv/pack-rul.lua
+++ b/tex/context/base/mkiv/pack-rul.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['pack-rul'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to pack-rul.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/spac-ali.lua b/tex/context/base/mkiv/spac-ali.lua
index c30a4fa94..7a09ba5aa 100644
--- a/tex/context/base/mkiv/spac-ali.lua
+++ b/tex/context/base/mkiv/spac-ali.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['spac-ali'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to spac-ali.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/spac-chr.lua b/tex/context/base/mkiv/spac-chr.lua
index 9b8453ca6..087bff89a 100644
--- a/tex/context/base/mkiv/spac-chr.lua
+++ b/tex/context/base/mkiv/spac-chr.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['spac-chr'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to spac-chr.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/spac-ver.lua b/tex/context/base/mkiv/spac-ver.lua
index 33b81e5c7..b2d5a3e2d 100644
--- a/tex/context/base/mkiv/spac-ver.lua
+++ b/tex/context/base/mkiv/spac-ver.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['spac-ver'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to spac-ver.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index d2faf2ac3..e1d84cd54 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 81adece53..1a650ecbf 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/supp-box.lua b/tex/context/base/mkiv/supp-box.lua
index a39bf392f..2dcbbb692 100644
--- a/tex/context/base/mkiv/supp-box.lua
+++ b/tex/context/base/mkiv/supp-box.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['supp-box'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to supp-box.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv
index 1fa52e625..acfcf7320 100644
--- a/tex/context/base/mkiv/syst-ini.mkiv
+++ b/tex/context/base/mkiv/syst-ini.mkiv
@@ -1190,5 +1190,4 @@
     \def\tokenized#1{\scantextokens\expandafter{\normalexpanded{#1}}}
 \fi
 
-
 \protect \endinput
diff --git a/tex/context/base/mkiv/syst-lua.lua b/tex/context/base/mkiv/syst-lua.lua
index 5976e077f..7e44b9f08 100644
--- a/tex/context/base/mkiv/syst-lua.lua
+++ b/tex/context/base/mkiv/syst-lua.lua
@@ -171,7 +171,9 @@ local xcomplex = xcomplex or { }
 
 local cmd          = tokens.commands
 
-local get_next     = token.get_next
+local scan_next    = token.scan_next or token.get_next
+local scan_cmdchr  = token.scan_cmdchr_expanded
+
 local get_command  = token.get_command
 local get_mode     = token.get_mode
 local get_index    = token.get_index
@@ -210,7 +212,7 @@ if CONTEXTLMTXMODE == 0 then
         local w = 0
         local r = 1
         while true do
-            local t = get_next()
+            local t = scan_next()
             local n = get_command(t)
             local c = cmd[n]
             -- todo, helper: returns number
@@ -292,8 +294,6 @@ if CONTEXTLMTXMODE == 0 then
 
 else
 
-    local get_cmdchrcs             = tokens.get_cmdchrcs or token.get_cmdchrcs
-
     local letter_code              = cmd.letter
     local other_char_code          = cmd.other_char
     local spacer_code              = cmd.spacer
@@ -311,10 +311,10 @@ else
     local math_given_code          = cmd.math_given
     local xmath_given_code         = cmd.xmath_given
     local some_item_code           = cmd.some_item
-    local call_code                = cmd.call
-    local the_code                 = cmd.the
-    local convert_code             = cmd.convert
-    local lua_expandable_call_code = cmd.lua_expandable_call
+ -- local call_code                = cmd.call
+ -- local the_code                 = cmd.the
+ -- local convert_code             = cmd.convert
+ -- local lua_expandable_call_code = cmd.lua_expandable_call
 
     local function unexpected(c)
         report("unexpected token %a",c)
@@ -324,8 +324,7 @@ else
         local w = 0
         local r = 1
         while true do
-            local t = get_next()
-            local n, i = get_cmdchrcs(t)
+        local n, i = scan_cmdchr()
             if n == letter_code then
                 w = w + 1 ; word[w] = utfchar(i)
             else
@@ -374,21 +373,21 @@ else
                     else
                         unexpected(c)
                     end
-                elseif n == call_code then
-                    local n = get_csname(t)
-                    if n then
-                        local s = get_macro(n)
-                        if s then
-                            r = r + 1 ; result[r] = s
-                        else
-                            unexpected(c)
-                        end
-                    else
-                        unexpected(c)
-                    end
-                elseif n == the_code or n == convert_code or n == lua_expandable_call_code then
-                    put_next(t)
-                    scan_token() -- expands
+             -- elseif n == call_code then
+             --     local n = get_csname(t)
+             --     if n then
+             --         local s = get_macro(n)
+             --         if s then
+             --             r = r + 1 ; result[r] = s
+             --         else
+             --             unexpected(c)
+             --         end
+             --     else
+             --         unexpected(c)
+             --     end
+             -- elseif n == the_code or n == convert_code or n == lua_expandable_call_code then
+             --     put_next(t)
+             --     scan_token() -- expands
                 else
                     unexpected(c)
                 end
diff --git a/tex/context/base/mkiv/tabl-tbl.mkiv b/tex/context/base/mkiv/tabl-tbl.mkiv
index 9fea15e83..ce8d67b63 100644
--- a/tex/context/base/mkiv/tabl-tbl.mkiv
+++ b/tex/context/base/mkiv/tabl-tbl.mkiv
@@ -2264,7 +2264,7 @@
    \s_tabl_tabulate_first.5\d_tabl_tabulate_unit
    \s_tabl_tabulate_last\s_tabl_tabulate_first
    \s_tabl_tabulate_pre\zeropoint
-   \s_tabl_tabulate_post\s_tabl_tabulate_first % was: \zeropoint
+   \s_tabl_tabulate_post\zeropoint
    \global\c_tabl_tabulate_columns\zerocount
    \global\c_tabl_tabulate_nofauto\zerocount
    \global\c_tabl_tabulate_noflines\zerocount
diff --git a/tex/context/base/mkiv/tabl-tbl.mkxl b/tex/context/base/mkiv/tabl-tbl.mkxl
index 8e4e45b9c..8bed65a9f 100644
--- a/tex/context/base/mkiv/tabl-tbl.mkxl
+++ b/tex/context/base/mkiv/tabl-tbl.mkxl
@@ -2259,6 +2259,15 @@
   {\setlocalhsize
    \hsize\localhsize}
 
+% test case for pre/post spacing:
+%
+% \ruledvbox{\starttabulate[|l|]  \FL\NC xxx \NC         \NR\LL\stoptabulate}
+% \ruledvbox{\starttabulate[|l|l|]\FL\NC xxx \NC xxx \NC \NR\LL\stoptabulate}
+% \ruledvbox{\starttabulate[|l|]     \NC xxx \NC         \NR   \stoptabulate}
+% \ruledvbox{\starttabulate[|lj8|]   \NC xxx \NC         \NR   \stoptabulate}
+% \ruledvbox{\starttabulate[|k8|]    \NC xxx \NC         \NR   \stoptabulate}
+% \ruledvbox{\starttabulate[|l|l|]   \NC xxx \NC xxx \NC \NR   \stoptabulate}
+
 \def\tabl_tabulate_process
   {\c_tabl_tabulate_pass\plusone
    \tabl_tabulate_check_full_content
@@ -2266,7 +2275,7 @@
    \s_tabl_tabulate_first.5\d_tabl_tabulate_unit
    \s_tabl_tabulate_last\s_tabl_tabulate_first
    \s_tabl_tabulate_pre\zeropoint
-   \s_tabl_tabulate_post\s_tabl_tabulate_first % was: \zeropoint
+   \s_tabl_tabulate_post\zeropoint
    \global\c_tabl_tabulate_columns\zerocount
    \global\c_tabl_tabulate_nofauto\zerocount
    \global\c_tabl_tabulate_noflines\zerocount
diff --git a/tex/context/base/mkiv/tabl-xtb.lua b/tex/context/base/mkiv/tabl-xtb.lua
index 2ff87e21a..c9dd1e4e5 100644
--- a/tex/context/base/mkiv/tabl-xtb.lua
+++ b/tex/context/base/mkiv/tabl-xtb.lua
@@ -900,7 +900,7 @@ function xtables.construct()
                 end
                 nofr = nofr + 1
                 local rp = rowproperties[r]
-                -- we have a direction issue here but hpack_node_list(list,0,"exactly","TLT") cannot be used
+                -- we have a direction issue here but hpack_node_list(list,0,"exactly") cannot be used
                 -- due to the fact that we need the width
                 local hbox = hpack_node_list(list)
                 setdirection(hbox,lefttoright_code)
diff --git a/tex/context/base/mkiv/toks-aux.lua b/tex/context/base/mkiv/toks-aux.lua
new file mode 100644
index 000000000..1cfc13af3
--- /dev/null
+++ b/tex/context/base/mkiv/toks-aux.lua
@@ -0,0 +1,88 @@
+if not modules then modules = { } end modules ['toks-aux'] = {
+    version   = 1.001,
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+if CONTEXTLMTXMODE > 0 then
+
+    local type, tostring = type, tostring
+    local max = math.max
+    local formatters, gsub = string.formatters, string.gsub
+
+    interfaces.implement {
+        name      = "showluatokens",
+        public    = true,
+        protected = true,
+        actions   = function()
+            local f0 = formatters["%s: %s"]
+            local nl = logs.newline
+            local wr = logs.writer
+            local t  = token.peek_next() -- local t = token.scan_next() token.put_back(t)
+            local n  = ""
+            local w  = ""
+            local c  = t.cmdname
+            if c == "left_brace" then
+                w = "given token list"
+                t = token.scan_toks(false)
+            elseif c == "register_toks" then
+                token.scan_next()
+                w = "token register"
+                n = t.csname or t.index
+                t = tex.gettoks(n,true)
+            elseif c == "internal_toks" then
+                token.scan_next()
+                w = "internal token variable"
+                n = t.csname or t.index
+                t = tex.gettoks(n,true)
+            else
+                if t.protected then
+                    w = "protected control sequence"
+                else
+                    w = "control sequence"
+                end
+                n = token.scan_csname()
+                t = token.get_meaning(n,true)
+            end
+            wr(f0(w,n))
+            nl()
+            if type(t) == "table" then
+                local w1 = 4
+                local w2 = 1
+                local w3 = 3
+                local w4 = 3
+                for i=1,#t do
+                    local ti = t[i]
+                    w1 = max(w1,#tostring(ti.id))
+                    w2 = max(w2,#tostring(ti.command))
+                    w3 = max(w3,#tostring(ti.index))
+                    w4 = max(w4,#ti.cmdname)
+                end
+                local f1 = formatters["%" .. w1 .. "i  %" .. w2 .. "i  %" .. w3 .. "i  %-" .. w4 .. "s  %s"]
+                local f2 = formatters["%" .. w1 .. "i  %" .. w2 .. "i  %" .. w3 .. "i  %-" .. w4 .. "s"]
+                local f3 = formatters["%" .. w1 .. "i  %" .. w2 .. "i  %" .. w3 .. "i  %-" .. w4 .. "s  %C"]
+                for i=1,#t do
+                    local ti = t[i]
+                    local cs = ti.csname
+                    local id = ti.id
+                    local ix = ti.index
+                    local cd = ti.command
+                    local cn = gsub(ti.cmdname,"_"," ")
+                    if cs then
+                        wr(f1(id,cd,ix,cn,cs))
+                    elseif cn == "letter" or cn == "other_char" then
+                        wr(f3(id,cd,ix,cn,ix))
+                    else
+                        wr(f2(id,cd,ix,cn))
+                        if cn == "end_match" then
+                            wr("-------")
+                        end
+                    end
+                end
+                nl()
+            end
+        end
+    }
+
+end
diff --git a/tex/context/base/mkiv/toks-aux.mkiv b/tex/context/base/mkiv/toks-aux.mkiv
index 5b43de596..413b1f7c8 100644
--- a/tex/context/base/mkiv/toks-aux.mkiv
+++ b/tex/context/base/mkiv/toks-aux.mkiv
@@ -15,6 +15,21 @@
 
 \unprotect
 
+% The older \type {\scantokens} overload has been replace by a more modern
+% one (in \LMTX):
+%
+% \protected\def\whatever#1[#2](#3)\relax{oeps #1 and #2 and #3 done ## error}
+% \scratchtoks{foo \framed{\red 123}456}
+%
+% \showluatokens{123\what}
+% \showluatokens\whatever
+% \showluatokens\framed
+%
+% \showluatokens\scratchtoks
+% \showluatokens\everypar
+
+\registerctxluafile{toks-aux}{}
+
 \installcorenamespace {tokenlist}
 
 \unexpanded\def\definetokenlist[#1]%
diff --git a/tex/context/base/mkiv/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua
index e0c093492..65a7645f4 100644
--- a/tex/context/base/mkiv/toks-ini.lua
+++ b/tex/context/base/mkiv/toks-ini.lua
@@ -68,16 +68,7 @@ local scan_luanumber   = token.scan_luanumber   or scan_float -- only lmtx
 local scan_luainteger  = token.scan_luainteger  or scan_int   -- only lmtx
 local scan_luacardinal = token.scan_luacardinal or scan_int   -- only lmtx
 
-local get_next         = token.get_next
------ get_next_token   = token.get_next_token
-local skip_next        = token.skip_next
-local peek_next_char   = token.peek_next_char
-local is_next_char     = token.is_next_char
-
 local set_macro        = token.set_macro
-local get_macro        = token.get_macro
-local get_meaning      = token.get_meaning
-local get_cmdname      = token.get_cmdname
 local set_char         = token.set_char
 local set_lua          = token.set_lua
 
@@ -173,50 +164,63 @@ if not scan_box then
 end
 
 tokens.scanners = { -- these expand
-    token       = scan_token,
-    toks        = scan_toks,
-    tokens      = scan_toks,
-    box         = scan_box,
-    hbox        = function() return scan_box("hbox") end,
-    vbox        = function() return scan_box("vbox") end,
-    vtop        = function() return scan_box("vtop") end,
-    dimen       = scan_dimen,
-    dimension   = scan_dimen,
-    glue        = scan_glue,
-    gluespec    = scan_gluespec,
-    integer     = scan_int,
-    real        = scan_real,
-    float       = scan_float,
-    luanumber   = scan_luanumber,
-    luainteger  = scan_luainteger,
-    luacardinal = scan_luacardinal,
-    count       = scan_int,
-    string      = scan_string,
-    argument    = scan_argument,
-    delimited   = scan_delimited,
-    tokenlist   = scan_tokenlist,
-    verbatim    = scan_verbatim, -- detokenize
-    code        = scan_code,
-    tokencode   = scan_token_code,
-    word        = scan_word,
-    letters     = scan_letters,
-    key         = scan_key,
-    value       = scan_value,
-    char        = scan_char,
-    number      = scan_number,
-    boolean     = scan_boolean,
-    keyword     = scan_keyword,
-    keywordcs   = scan_keyword_cs,
-    csname      = scan_csname,
-    peek        = peek_next_char,
-    skip        = skip_next,
-    ischar      = is_next_char,
+    token          = scan_token,
+    toks           = scan_toks,
+    tokens         = scan_toks,
+    box            = scan_box,
+    hbox           = function() return scan_box("hbox") end,
+    vbox           = function() return scan_box("vbox") end,
+    vtop           = function() return scan_box("vtop") end,
+    dimen          = scan_dimen,
+    dimension      = scan_dimen,
+    glue           = scan_glue,
+    gluespec       = scan_gluespec,
+    integer        = scan_int,
+    real           = scan_real,
+    float          = scan_float,
+    luanumber      = scan_luanumber,
+    luainteger     = scan_luainteger,
+    luacardinal    = scan_luacardinal,
+    count          = scan_int,
+    string         = scan_string,
+    argument       = scan_argument,
+    delimited      = scan_delimited,
+    tokenlist      = scan_tokenlist,
+    verbatim       = scan_verbatim, -- detokenize
+    code           = scan_code,
+    tokencode      = scan_token_code,
+    word           = scan_word,
+    letters        = scan_letters,
+    key            = scan_key,
+    value          = scan_value,
+    char           = scan_char,
+    number         = scan_number,
+    boolean        = scan_boolean,
+    keyword        = scan_keyword,
+    keywordcs      = scan_keyword_cs,
+    csname         = scan_csname,
+
+    next           = token.scan_next,
+    nextexpanded   = token.scan_next_expanded,
+
+    peek           = token.peek_next,
+    peekexpanded   = token.peek_next_expanded,
+    peekchar       = token.peek_next_char,
+
+    skip           = token.skip_next,
+    skipexpanded   = token.skip_next_expanded,
+
+    cmdchr         = token.scan_cmdchr,
+    cmdchrexpanded = token.scan_cmdchr_expanded,
+
+    ischar         = token.is_next_char,
 }
 
 tokens.getters = { -- these don't expand
-    meaning = get_meaning,
-    macro   = get_macro,
-    token   = get_next,
+    meaning = token.get_meaning,
+    macro   = token.get_macro,
+    token   = token.scan_next,   -- not here, use scanners.next or token
+    cstoken = token.get_cstoken,
     count   = tex.getcount,
     dimen   = tex.getdimen,
     skip    = tex.getglue,
@@ -239,6 +243,23 @@ tokens.setters = {
     box   = tex.setbox,
 }
 
+token.accessors = {
+    command    = token.get_command,
+    cmd        = token.get_command,
+    cmdname    = token.get_cmdname,
+    name       = token.get_cmdname,
+    csname     = token.get_csname,
+    index      = token.get_index,
+    active     = token.get_active,
+    frozen     = token.get_frozen,
+    protected  = token.get_protected,
+    expandable = token.get_protected,
+    user       = token.get_user,
+    cmdchrcs   = token.get_cmdchrcs,
+    active     = token.get_active,
+    range      = token.get_range,
+}
+
 -- static int run_scan_token(lua_State * L)
 -- {
 --     saved_tex_scanner texstate;
diff --git a/tex/context/base/mkiv/toks-tra.mkiv b/tex/context/base/mkiv/toks-tra.mkiv
deleted file mode 100644
index 04f837f1c..000000000
--- a/tex/context/base/mkiv/toks-tra.mkiv
+++ /dev/null
@@ -1,34 +0,0 @@
-%D \module
-%D   [       file=toks-tra, % was toks-ini
-%D        version=2007.03.03,
-%D          title=\CONTEXT\ Token Support,
-%D       subtitle=Initialization,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\writestatus{loading}{ConTeXt Token Support / Tracing}
-
-\registerctxluafile{toks-tra}{}
-
-\unprotect
-
-%D Handy for manuals \unknown\ but not really used in practice, so it might
-%D become a runtime loaded module instead.
-
-\unexpanded\def\starttokens  [#1]{\ctxcommand{collecttokens("#1","stoptokens")}}
-           \let\stoptokens        \relax
-\unexpanded\def\flushtokens  [#1]{\ctxcommand{flushtokens("#1")}}
-\unexpanded\def\showtokens   [#1]{\ctxcommand{showtokens("#1")}}
-\unexpanded\def\testtokens   [#1]{\ctxcommand{testtokens("#1")}}
-\unexpanded\def\registertoken  #1{\ctxcommand{registertoken("#1")}}
-
-\let\toks_show\showtokens % we also support the primitive
-
-\unexpanded\def\showtokens{\doifelsenextoptional\toks_show\normalshowtokens}
-
-\protect \endinput
diff --git a/tex/context/base/mkiv/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua
index f89043547..2d2fd4092 100644
--- a/tex/context/base/mkiv/trac-vis.lua
+++ b/tex/context/base/mkiv/trac-vis.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['trac-vis'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to trac-vis.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/typo-cap.lua b/tex/context/base/mkiv/typo-cap.lua
index c1666a9f1..3d0d6055a 100644
--- a/tex/context/base/mkiv/typo-cap.lua
+++ b/tex/context/base/mkiv/typo-cap.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['typo-cap'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to typo-cap.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/typo-dha.lua b/tex/context/base/mkiv/typo-dha.lua
index 7d5c7751b..7be74caa1 100644
--- a/tex/context/base/mkiv/typo-dha.lua
+++ b/tex/context/base/mkiv/typo-dha.lua
@@ -14,12 +14,12 @@ if not modules then modules = { } end modules ['typo-dha'] = {
 --
 -- Then we have, with input: LATIN ARAB
 --
--- \textdir TLT LATIN ARAB => LATIN BARA
--- \textdir TRT LATIN ARAB => LATIN BARA
--- \textdir TRT LRO LATIN ARAB => LATIN ARAB
--- \textdir TLT LRO LATIN ARAB => LATIN ARAB
--- \textdir TLT RLO LATIN ARAB => NITAL ARAB
--- \textdir TRT RLO LATIN ARAB => NITAL ARAB
+-- \textdirection 1 LATIN ARAB => LATIN BARA
+-- \textdirection 1 LATIN ARAB => LATIN BARA
+-- \textdirection 1 LRO LATIN ARAB => LATIN ARAB
+-- \textdirection 1 LRO LATIN ARAB => LATIN ARAB
+-- \textdirection 1 RLO LATIN ARAB => NITAL ARAB
+-- \textdirection 1 RLO LATIN ARAB => NITAL ARAB
 
 -- elseif d == "es"  then -- European Number Separator
 -- elseif d == "et"  then -- European Number Terminator
@@ -272,12 +272,12 @@ local function process(start)
                             stack[top] = { override, embedded }
                             override   = 1
                             obsolete[#obsolete+1] = current
-                        elseif direction == "lre" then -- Left-to-Right Embedding -> TLT
+                        elseif direction == "lre" then -- Left-to-Right Embedding -> lefttoright_code
                             top        = top + 1
                             stack[top] = { override, embedded }
                             embedded   = 1
                             obsolete[#obsolete+1] = current
-                        elseif direction == "rle" then -- Right-to-Left Embedding -> TRT
+                        elseif direction == "rle" then -- Right-to-Left Embedding -> righttoleft_code
                             top        = top + 1
                             stack[top] = { override, embedded }
                             embedded   = -1
@@ -382,7 +382,7 @@ local function process(start)
             if cp == "n" then
                 local swap = state == "r"
                 if swap then
-                    head = insert_node_before(head,current,startdir("TLT"))
+                    head = insert_node_before(head,current,startdir(lefttoright_code))
                 end
                 setprop(current,"direction",true)
                 while true do
@@ -395,14 +395,14 @@ local function process(start)
                     end
                 end
                 if swap then
-                    head, current = insert_node_after(head,current,stopdir("TLT"))
+                    head, current = insert_node_after(head,current,stopdir(lefttoright_code))
                 end
             elseif cp == "l" then
                 if state ~= "l" then
                     if state == "r" then
-                        head = insert_node_before(head,last or current,stopdir("TRT"))
+                        head = insert_node_before(head,last or current,stopdir(righttoleft_code))
                     end
-                    head  = insert_node_before(head,current,startdir("TLT"))
+                    head  = insert_node_before(head,current,startdir(lefttoright_code))
                     state = "l"
                     done  = true
                 end
@@ -410,9 +410,9 @@ local function process(start)
             elseif cp == "r" then
                 if state ~= "r" then
                     if state == "l" then
-                        head = insert_node_before(head,last or current,stopdir("TLT"))
+                        head = insert_node_before(head,last or current,stopdir(lefttoright_code))
                     end
-                    head  = insert_node_before(head,current,startdir("TRT"))
+                    head  = insert_node_before(head,current,startdir(righttoleft_code))
                     state = "r"
                     done  = true
                 end
@@ -425,9 +425,9 @@ local function process(start)
                 end
             else
                 if state == "r" then
-                    head = insert_node_before(head,current,stopdir("TRT"))
+                    head = insert_node_before(head,current,stopdir(righttoleft_code))
                 elseif state == "l" then
-                    head = insert_node_before(head,current,stopdir("TLT"))
+                    head = insert_node_before(head,current,stopdir(lefttoright_code))
                 end
                 state = false
                 last  = false
@@ -438,7 +438,7 @@ local function process(start)
         if next then
             current = next
         else
-            local sd = (state == "r" and stopdir("TRT")) or (state == "l" and stopdir("TLT"))
+            local sd = (state == "r" and stopdir(righttoleft_code)) or (state == "l" and stopdir(lefttoright_code))
             if sd then
                 if id == glue_code and getsubtype(current) == parfillskip_code then
                     head = insert_node_before(head,current,sd)
diff --git a/tex/context/base/mkiv/typo-dig.lua b/tex/context/base/mkiv/typo-dig.lua
index 175fc0cc7..a9294a38d 100644
--- a/tex/context/base/mkiv/typo-dig.lua
+++ b/tex/context/base/mkiv/typo-dig.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['typo-dig'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to typo-dig.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/typo-dua.lua b/tex/context/base/mkiv/typo-dua.lua
index 0cec0e08e..92cca7ae4 100644
--- a/tex/context/base/mkiv/typo-dua.lua
+++ b/tex/context/base/mkiv/typo-dua.lua
@@ -343,12 +343,6 @@ local function get_baselevel(head,list,size,direction)
             return direction, true
         end
     end
-    -- for old times sake we we handle strings too
-    if direction == "TLT" then
-        return lefttoright_code, true
-    elseif direction == "TRT" then
-        return righttoleft_code, true
-    end
     -- P2, P3
     for i=1,size do
         local entry     = list[i]
diff --git a/tex/context/base/mkiv/typo-dub.lua b/tex/context/base/mkiv/typo-dub.lua
index f1bd38fcc..ccbcc0a06 100644
--- a/tex/context/base/mkiv/typo-dub.lua
+++ b/tex/context/base/mkiv/typo-dub.lua
@@ -404,12 +404,6 @@ local function get_baselevel(head,list,size,direction)
             return direction, true
         end
     end
-    -- for old times sake we we handle strings too
-    if direction == "TLT" then
-        return lefttoright_code, true
-    elseif direction == "TRT" then
-        return righttoleft_code, true
-    end
     -- P2, P3
     for i=1,size do
         local entry     = list[i]
diff --git a/tex/context/base/mkiv/typo-duc.lua b/tex/context/base/mkiv/typo-duc.lua
index d4c56e300..a1ee14a28 100644
--- a/tex/context/base/mkiv/typo-duc.lua
+++ b/tex/context/base/mkiv/typo-duc.lua
@@ -419,12 +419,6 @@ local function get_baselevel(head,list,size,direction)
             return direction, true
         end
     end
-    -- for old times sake we we handle strings too
-    if direction == "TLT" then
-        return lefttoright_code, true
-    elseif direction == "TRT" then
-        return righttoleft_code, true
-    end
     -- P2, P3
     for i=1,size do
         local entry     = list[i]
diff --git a/tex/context/base/mkiv/util-fil.lua b/tex/context/base/mkiv/util-fil.lua
index 79af27743..183f7bea8 100644
--- a/tex/context/base/mkiv/util-fil.lua
+++ b/tex/context/base/mkiv/util-fil.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['util-fil'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to luat-lib.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/tex/context/base/mkiv/util-sac.lua b/tex/context/base/mkiv/util-sac.lua
index 47c753ab1..a8851f4c8 100644
--- a/tex/context/base/mkiv/util-sac.lua
+++ b/tex/context/base/mkiv/util-sac.lua
@@ -1,5 +1,6 @@
 if not modules then modules = { } end modules ['util-sac'] = {
     version   = 1.001,
+    optimize  = true,
     comment   = "companion to luat-lib.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
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>
diff --git a/tex/context/interface/mkiv/i-accent.xml b/tex/context/interface/mkiv/i-accent.xml
index 1b9560cb1..d14690e58 100644
--- a/tex/context/interface/mkiv/i-accent.xml
+++ b/tex/context/interface/mkiv/i-accent.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineaccent" level="style" file="enco-ini.mkiv">
+    <cd:command name="defineaccent" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="string-character"/>
             <cd:resolve name="string-character"/>
@@ -12,150 +12,150 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecharacter" level="style" file="enco-ini.mkiv">
+    <cd:command name="definecharacter" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="string-character"/>
             <cd:resolve name="string-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecommand" level="style" file="enco-ini.mkiv">
+    <cd:command name="definecommand" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="string-character"/>
             <cd:resolve name="string-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definemathaccent" level="style" file="enco-ini.mkiv">
+    <cd:command name="definemathaccent" level="style" category="mathematics" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
             <cd:resolve name="string-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildmathaccent" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildmathaccent" level="style" category="mathematics" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextaccent" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextaccent" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextmacron" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextmacron" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextbottomdot" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextbottomdot" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextcedilla" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextcedilla" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextognek" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextognek" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextbottomcomma" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextbottomcomma" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="d" level="style" file="enco-ini.mkiv">
+    <cd:command name="d" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="buildtextgrave" level="style" file="enco-ini.mkiv">
+    <cd:command name="buildtextgrave" level="style" category="language" file="enco-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="acute" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="acute" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="grave" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="grave" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ddot" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="ddot" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tilde" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="tilde" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bar" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="bar" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="breve" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="breve" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="check" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="check" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hat" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="hat" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vec" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="vec" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dot" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="dot" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ring" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="ring" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dddot" category="mathematics" level="document" file="math-acc.mkvi">
+    <cd:command name="dddot" level="document" category="mathematics" file="math-acc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
@@ -163,101 +163,101 @@
 
     <!--
 
-        <cd:command name="AA" file="enco-ini.mkiv"/>
+        <cd:command name="AA" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="aa" file="enco-ini.mkiv"/>
+        <cd:command name="aa" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="AE" file="enco-ini.mkiv"/>
+        <cd:command name="AE" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="ae" file="enco-ini.mkiv"/>
+        <cd:command name="ae" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="CC" file="enco-ini.mkiv"/>
+        <cd:command name="CC" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="cc" file="enco-ini.mkiv"/>
+        <cd:command name="cc" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="L" file="enco-ini.mkiv"/>
+        <cd:command name="L" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="l" file="enco-ini.mkiv"/>
+        <cd:command name="l" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="O" file="enco-ini.mkiv"/>
+        <cd:command name="O" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="o" file="enco-ini.mkiv"/>
+        <cd:command name="o" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="OE" file="enco-ini.mkiv"/>
+        <cd:command name="OE" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="oe" file="enco-ini.mkiv"/>
+        <cd:command name="oe" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="SZ" file="enco-ini.mkiv"/>
+        <cd:command name="SZ" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="sz" file="enco-ini.mkiv"/>
+        <cd:command name="sz" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="SS" file="enco-ini.mkiv"/>
+        <cd:command name="SS" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="IJ" file="enco-ini.mkiv"/>
+        <cd:command name="IJ" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="ij" file="enco-ini.mkiv"/>
+        <cd:command name="ij" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="i" file="enco-ini.mkiv"/>
+        <cd:command name="i" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="j" file="enco-ini.mkiv"/>
+        <cd:command name="j" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="eszett" file="enco-ini.mkiv"/>
+        <cd:command name="eszett" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Eszett" file="enco-ini.mkiv"/>
+        <cd:command name="Eszett" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Ssharp" file="enco-ini.mkiv"/>
+        <cd:command name="Ssharp" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="lslash" file="enco-ini.mkiv"/>
+        <cd:command name="lslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Lslash" file="enco-ini.mkiv"/>
+        <cd:command name="Lslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="dslash" file="enco-ini.mkiv"/>
+        <cd:command name="dslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Dslash" file="enco-ini.mkiv"/>
+        <cd:command name="Dslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="oslash" file="enco-ini.mkiv"/>
+        <cd:command name="oslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Oslash" file="enco-ini.mkiv"/>
+        <cd:command name="Oslash" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="dcroat" file="enco-ini.mkiv"/>
+        <cd:command name="dcroat" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Dcroat" file="enco-ini.mkiv"/>
+        <cd:command name="Dcroat" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="kcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="kcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Kcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="Kcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="lcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="lcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Lcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="Lcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="ncedilla" file="enco-ini.mkiv"/>
+        <cd:command name="ncedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Ncedilla" file="enco-ini.mkiv"/>
+        <cd:command name="Ncedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="rcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="rcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Rcedilla" file="enco-ini.mkiv"/>
+        <cd:command name="Rcedilla" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="aumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="aumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Aumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="Aumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="eumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="eumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Eumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="Eumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="iumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="iumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Iumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="Iumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="oumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="oumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Oumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="Oumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="uumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="uumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
-        <cd:command name="Uumlaut" file="enco-ini.mkiv"/>
+        <cd:command name="Uumlaut" level="document" category="language" file="enco-ini.mkiv"/>
 
     -->
 
diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml
index eaebaa698..46afca897 100644
--- a/tex/context/interface/mkiv/i-align.xml
+++ b/tex/context/interface/mkiv/i-align.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupalign" category="alignment" level="style" file="spac-ali.mkiv">
+    <cd:command name="setupalign" level="style" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:constant type="broad"/>
@@ -74,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="alignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="alignment" type="environment" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:inherit name="setupalign"/>
@@ -82,7 +82,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linealignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="linealignment" type="environment" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="left"/>
@@ -93,49 +93,49 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="leftaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="middlealigned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="middlealigned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="rightaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="rightaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="maxaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="maxaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="midaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="midaligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="centeraligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/>
+    <cd:command name="centeraligned" type="environment" level="document" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="leftaligned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="leftaligned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightaligned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="rightaligned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="middlealigned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="middlealigned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="maxaligned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="maxaligned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="midaligned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="midaligned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="centeraligned" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="centeraligned" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
@@ -149,7 +149,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="wordright" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="wordright" level="document" category="alignment" keywords="linebreak" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="right"/>
@@ -159,7 +159,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplealignedbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="simplealignedbox" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-alignsimple"/>
@@ -167,7 +167,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplealignedspreadbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="simplealignedspreadbox" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-alignsimple"/>
@@ -175,7 +175,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="simplealignedboxplus" level="system" category="alignment" keywords="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-alignsimple"/>
@@ -184,7 +184,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplereversealignedbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="simplereversealignedbox" level="system" category="alignment" keywords="boxes direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-alignsimple"/>
@@ -192,7 +192,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplereversealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="simplereversealignedboxplus" level="system" category="alignment" keywords="boxes direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-alignsimple"/>
@@ -201,7 +201,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="alignedbox" level="system" category="alignment" file="pack-box.mkiv">
+    <cd:command name="alignedbox" level="system" category="alignment" keywords="boxes" file="pack-box.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:resolve name="value-aligned"/>
@@ -220,65 +220,65 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefttoright" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="lefttoright" level="style" category="alignment" keywords="direction" file="spac-ali.mkiv"/>
 
-    <cd:command name="righttoleft" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="righttoleft" level="style" category="alignment" keywords="direction" file="spac-ali.mkiv"/>
 
-    <cd:command name="raggedbottom" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="raggedbottom" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="alignbottom" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="alignbottom" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="baselinebottom" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="baselinebottom" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="notragged" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="notragged" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="raggedleft" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="raggedleft" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="raggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="raggedcenter" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="raggedright" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="raggedright" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="veryraggedleft" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="veryraggedleft" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="veryraggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="veryraggedcenter" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="veryraggedright" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="veryraggedright" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="raggedwidecenter" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="raggedwidecenter" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="centeredlastline" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="centeredlastline" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="flushedrightlastline" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="flushedrightlastline" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="ttraggedright" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="ttraggedright" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="forgetragged" category="alignment" level="style" file="spac-ali.mkiv"/>
+    <cd:command name="forgetragged" level="style" category="alignment" file="spac-ali.mkiv"/>
 
-    <cd:command name="line" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="line" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftline" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="leftline" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightline" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="rightline" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="centerline" category="alignment" level="document" file="spac-ali.mkiv">
+    <cd:command name="centerline" level="document" category="alignment" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hanging" type="environment" category="alignment" level="document" file="spac-ver.mkiv">
+    <cd:command name="hanging" type="environment" level="document" category="alignment" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:parameter name="distance">
@@ -296,7 +296,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hanging" type="environment" variant="argument" category="alignment" level="document" file="spac-ver.mkiv">
+    <cd:command name="hanging" type="environment" variant="argument" level="document" category="alignment" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="left" default="yes"/>
@@ -306,7 +306,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fixed" type="environment" category="alignment" level="document" file="spac-ver.mkiv">
+    <cd:command name="fixed" type="environment" level="document" category="alignment" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="low"/>
diff --git a/tex/context/interface/mkiv/i-anchor.xml b/tex/context/interface/mkiv/i-anchor.xml
index b3c366cfd..28b69a436 100644
--- a/tex/context/interface/mkiv/i-anchor.xml
+++ b/tex/context/interface/mkiv/i-anchor.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineanchor" level="style" file="pack-box.mkiv">
+    <cd:command name="defineanchor" level="style" category="graphics" file="pack-box.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name"/>
@@ -18,7 +18,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="anchor" level="document" file="pack-box.mkiv">
+    <cd:command name="anchor" level="document" category="graphics" file="pack-box.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml
index ed7586000..6fb25884c 100644
--- a/tex/context/interface/mkiv/i-attachment.xml
+++ b/tex/context/interface/mkiv/i-attachment.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineattachment" level="style" file="scrn-wid.mkvi">
+    <cd:command name="defineattachment" level="style" category="pdf" file="scrn-wid.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupattachment" level="style" file="scrn-wid.mkvi">
+    <cd:command name="setupattachment" level="style" category="pdf" file="scrn-wid.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupattachments" level="style" file="scrn-wid.mkvi">
+    <cd:command name="setupattachments" level="style" category="pdf" file="scrn-wid.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -97,7 +97,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="registerattachment" level="document" file="scrn-wid.mkvi">
+    <cd:command name="registerattachment" level="document" category="pdf" file="scrn-wid.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -106,7 +106,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="attachment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi">
+    <cd:command name="attachment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi">
         <cd:sequence>
             <cd:instance value="attachment"/>
         </cd:sequence>
@@ -121,7 +121,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi">
+    <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi">
         <cd:sequence>
             <cd:instance value="attachment"/>
         </cd:sequence>
@@ -136,11 +136,11 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placeattachments" level="document" file="scrn-wid.mkvi"/>
+    <cd:command name="placeattachments" level="document" category="pdf" file="scrn-wid.mkvi"/>
 
     <!--
 
-        <cd:command name="attachment" file="scrn-wid.mkvi">
+        <cd:command name="attachment" level="document" category="pdf" file="scrn-wid.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-optional"/>
                 <cd:assignments list="yes" optional="yes">
@@ -149,7 +149,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="attachment" type="environment" file="scrn-wid.mkvi">
+        <cd:command name="attachment" type="environment" level="document" category="pdf" file="scrn-wid.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-optional"/>
                 <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml
index f1117cf04..77b91ff44 100644
--- a/tex/context/interface/mkiv/i-attribute.xml
+++ b/tex/context/interface/mkiv/i-attribute.xml
@@ -4,25 +4,25 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="pushattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="pushattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="popattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="popattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installattributestack" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="installattributestack" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="defineattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -35,7 +35,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definesystemattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="definesystemattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -48,51 +48,51 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="newattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="newattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosetattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="dosetattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doresetattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="doresetattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogetattribute" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="dogetattribute" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogetattributeid" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="dogetattributeid" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetallattributes" category="attribute" level="system" file="attr-ini.mkiv"/>
+    <cd:command name="resetallattributes" level="system" category="attribute" file="attr-ini.mkiv"/>
 
-    <cd:command name="savecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="savecurrentattributes" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="restorecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv">
+    <cd:command name="restorecurrentattributes" level="system" category="attribute" file="attr-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showattributes" category="attribute" level="document" file="attr-ini.mkiv"/>
+    <cd:command name="showattributes" level="document" category="attribute" file="attr-ini.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml
index ccb948e9b..2ec8f422b 100644
--- a/tex/context/interface/mkiv/i-backend.xml
+++ b/tex/context/interface/mkiv/i-backend.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupbackend" level="style" catehory="pdf" file="back-ini.mkiv">
+    <cd:command name="setupbackend" level="style" category="pdf" file="back-ini.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="export">
@@ -86,7 +86,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupoutput" file="back-ini.mkxl">
+    <cd:command name="setupoutput" level="style" category="pdf" file="back-ini.mkxl">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="default"/>
diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml
index 6bdddbb1b..b638e4a20 100644
--- a/tex/context/interface/mkiv/i-background.xml
+++ b/tex/context/interface/mkiv/i-background.xml
@@ -85,7 +85,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="backgroundline" level="document" category="background colors" file="pack-bck.mkvi">
+    <cd:command name="backgroundline" level="document" category="background" keywords="colors" file="pack-bck.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-color"/>
             <cd:content/>
@@ -140,7 +140,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesomebackground" level="system" category="background conditional" file="page-bck.mkiv">
+    <cd:command name="doifelsesomebackground" level="system" category="background" keywords="conditional" file="page-bck.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -148,7 +148,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomebackgroundelse" level="system" category="background conditional" file="page-bck.mkiv">
+    <cd:command name="doifsomebackgroundelse" level="system" category="background" keywords="conditional" file="page-bck.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -156,7 +156,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomebackground" level="system" category="background conditional" file="page-bck.mkiv">
+    <cd:command name="doifsomebackground" level="system" category="background" keywords="conditional" file="page-bck.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml
index d9561a59f..84992ebc6 100644
--- a/tex/context/interface/mkiv/i-blackrule.xml
+++ b/tex/context/interface/mkiv/i-blackrule.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupblackrules" level="style" category="rules colors" file="pack-mrl.mkiv">
+    <cd:command name="setupblackrules" level="style" category="rules" keywords="colors" file="pack-mrl.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="width">
@@ -47,7 +47,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="blackrule" level="document" category="rules colors" file="pack-mrl.mkiv">
+    <cd:command name="blackrule" level="document" category="rules" keywords="colors" file="pack-mrl.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupblackrules"/>
@@ -55,7 +55,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="blackrules" level="document" category="rules colors" file="pack-mrl.mkiv">
+    <cd:command name="blackrules" level="document" category="rules" keywords="colors" file="pack-mrl.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupblackrules"/>
@@ -117,4 +117,19 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="autorule" level="style" category="rules" file="node-rul.mkiv">
+        <cd:arguments>
+            <cd:keywords delimiters="none" list="yes">
+                <cd:constant type="cd:dimension" prefix="width␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="height␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="depth␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="xoffset␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="yoffset␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="left␣" method="none"/>
+                <cd:constant type="cd:dimension" prefix="right␣" method="none"/>
+            </cd:keywords>
+            <cd:delimiter name="relax"/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml
index 8c6c6c74a..e18243811 100644
--- a/tex/context/interface/mkiv/i-boxes.xml
+++ b/tex/context/interface/mkiv/i-boxes.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="doiftext" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doiftext" level="system" category="strings" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsetext" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifelsetext" level="system" category="strings" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -20,7 +20,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiftextelse" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doiftextelse" level="system" category="strings" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -28,7 +28,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithnextbox" level="system" file="supp-box.mkiv">
+    <cd:command name="dowithnextbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:csname/>
@@ -36,7 +36,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithnextboxcs" level="system" file="supp-box.mkiv">
+    <cd:command name="dowithnextboxcs" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -44,21 +44,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="nextboxwd" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextboxwd" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="nextboxht" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextboxht" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="nextboxdp" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextboxdp" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="nextboxhtdp" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextboxhtdp" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="flushnextbox" level="system" file="supp-box.mkiv"/>
+    <cd:command name="flushnextbox" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="nextbox" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextbox" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="nextdepth" level="system" file="supp-box.mkiv"/>
+    <cd:command name="nextdepth" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="dowithnextboxcontent" level="system" file="supp-box.mkiv">
+    <cd:command name="dowithnextboxcontent" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -67,7 +67,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithnextboxcontentcs" level="system" file="supp-box.mkiv">
+    <cd:command name="dowithnextboxcontentcs" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -76,55 +76,55 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rlap" level="system" file="supp-box.mkiv">
+    <cd:command name="rlap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="llap" level="system" file="supp-box.mkiv">
+    <cd:command name="llap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="clap" level="system" file="supp-box.mkiv">
+    <cd:command name="clap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tlap" level="system" file="supp-box.mkiv">
+    <cd:command name="tlap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="blap" level="system" file="supp-box.mkiv">
+    <cd:command name="blap" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reshapebox" level="system" file="supp-box.mkiv">
+    <cd:command name="reshapebox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" file="supp-box.mkiv"/>
+    <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="flushshapebox" level="system" file="supp-box.mkiv"/>
+    <cd:command name="flushshapebox" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="innerflushshapebox" level="system" file="supp-box.mkiv"/>
+    <cd:command name="innerflushshapebox" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="shapedhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="shapedhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processtokens" level="system" file="supp-box.mkiv">
+    <cd:command name="processtokens" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -134,7 +134,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doboundtext" level="system" file="supp-box.mkiv">
+    <cd:command name="doboundtext" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-dimension"/>
@@ -142,7 +142,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="limitatetext" level="system" file="supp-box.mkiv">
+    <cd:command name="limitatetext" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:keywords delimiters="braces">
@@ -152,7 +152,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="limitatetext" variant="list" level="system" file="supp-box.mkiv">
+    <cd:command name="limitatetext" variant="list" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:keywords delimiters="braces" list="yes">
@@ -162,7 +162,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="limitatefirstline" level="system" file="supp-box.mkiv">
+    <cd:command name="limitatefirstline" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-dimension"/>
@@ -170,159 +170,159 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processisolatedchars" level="system" file="supp-box.mkiv">
+    <cd:command name="processisolatedchars" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processisolatedwords" level="system" file="supp-box.mkiv">
+    <cd:command name="processisolatedwords" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytocharacters" level="system" file="supp-box.mkiv">
+    <cd:command name="applytocharacters" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytowords" level="system" file="supp-box.mkiv">
+    <cd:command name="applytowords" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringchar" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringchar" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringword" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringword" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringline" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringline" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringcharspaced" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringcharspaced" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringwordspaced" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringwordspaced" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytosplitstringlinespaced" level="system" file="supp-box.mkiv">
+    <cd:command name="applytosplitstringlinespaced" level="system" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="sbox" level="system" file="supp-box.mkiv">
+    <cd:command name="sbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linebox" level="system" file="supp-box.mkiv">
+    <cd:command name="linebox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shiftbox" level="system" file="supp-box.mkiv">
+    <cd:command name="shiftbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:dimension/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hpackbox" level="system" file="supp-box.mkiv">
+    <cd:command name="hpackbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:dimension/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vpackbox" level="system" file="supp-box.mkiv">
+    <cd:command name="vpackbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:dimension/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hpackedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="hpackedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:dimension/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vpackedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="vpackedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:dimension/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inlinedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="inlinedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="struttedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="struttedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="topskippedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="topskippedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="centeredbox" level="system" file="supp-box.mkiv">
+    <cd:command name="centeredbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="centerednextbox" level="system" file="supp-box.mkiv">
+    <cd:command name="centerednextbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="centerbox" level="system" file="supp-box.mkiv">
+    <cd:command name="centerbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setrigidcolumnhsize" level="system" file="supp-box.mkiv">
+    <cd:command name="setrigidcolumnhsize" level="system" category="columns" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -330,21 +330,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setrigidcolumnbalance" level="system" file="supp-box.mkiv">
+    <cd:command name="setrigidcolumnbalance" level="system" category="columns" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vboxtohbox" type="environment" level="system" file="supp-box.mkiv"/>
+    <cd:command name="vboxtohbox" type="environment" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="vboxtohboxseparator" type="environment" level="system" file="supp-box.mkiv"/>
+    <cd:command name="vboxtohboxseparator" type="environment" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="convertvboxtohbox" level="system" file="supp-box.mkiv"/>
+    <cd:command name="convertvboxtohbox" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="hboxestohbox" type="environment" level="system" file="supp-box.mkiv"/>
+    <cd:command name="hboxestohbox" type="environment" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="unhhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="unhhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:delimiter name="with"/>
@@ -354,17 +354,17 @@
 
     <!--
 
-        <cd:command name="hhbox" level="system" file="supp-box.mkiv"/>
+        <cd:command name="hhbox" level="system" category="boxes" file="supp-box.mkiv"/>
 
     -->
 
-    <cd:command name="hboxofvbox" level="system" file="supp-box.mkiv">
+    <cd:command name="hboxofvbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcontent" level="system" file="supp-box.mkiv">
+    <cd:command name="doifcontent" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -374,105 +374,105 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="overlay" type="environment" level="system" file="supp-box.mkiv"/>
+    <cd:command name="overlay" type="environment" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="fakebox" level="system" file="supp-box.mkiv">
+    <cd:command name="fakebox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cbox" level="system" file="supp-box.mkiv">
+    <cd:command name="cbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rbox" level="system" file="supp-box.mkiv">
+    <cd:command name="rbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ltop" level="system" file="supp-box.mkiv">
+    <cd:command name="ltop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ctop" level="system" file="supp-box.mkiv">
+    <cd:command name="ctop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rtop" level="system" file="supp-box.mkiv">
+    <cd:command name="rtop" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tbox" level="system" file="supp-box.mkiv">
+    <cd:command name="tbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bbox" level="system" file="supp-box.mkiv">
+    <cd:command name="bbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="mhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="rhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefthbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lefthbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="midhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="midhbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="righthbox" level="system" file="supp-box.mkiv">
+    <cd:command name="righthbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="boxofsize" level="system" file="supp-box.mkiv">
+    <cd:command name="boxofsize" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:keywords delimiters="none" list="yes" optional="yes">
@@ -482,7 +482,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="limitatelines" level="system" file="supp-box.mkiv">
+    <cd:command name="limitatelines" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-command"/>
@@ -490,117 +490,117 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fittopbaselinegrid" level="system" file="supp-box.mkiv">
+    <cd:command name="fittopbaselinegrid" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="boxcursor" level="system" file="supp-box.mkiv"/>
+    <cd:command name="boxcursor" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="placedbox" level="system" file="supp-box.mkiv">
+    <cd:command name="placedbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightbox" level="system" file="supp-box.mkiv">
+    <cd:command name="rightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftbox" level="system" file="supp-box.mkiv">
+    <cd:command name="leftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="topbox" level="system" file="supp-box.mkiv">
+    <cd:command name="topbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bottombox" level="system" file="supp-box.mkiv">
+    <cd:command name="bottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefttopbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lefttopbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="righttopbox" level="system" file="supp-box.mkiv">
+    <cd:command name="righttopbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftbottombox" level="system" file="supp-box.mkiv">
+    <cd:command name="leftbottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightbottombox" level="system" file="supp-box.mkiv">
+    <cd:command name="rightbottombox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="topleftbox" level="system" file="supp-box.mkiv">
+    <cd:command name="topleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="toprightbox" level="system" file="supp-box.mkiv">
+    <cd:command name="toprightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bottomleftbox" level="system" file="supp-box.mkiv">
+    <cd:command name="bottomleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bottomrightbox" level="system" file="supp-box.mkiv">
+    <cd:command name="bottomrightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="middlebox" level="system" file="supp-box.mkiv">
+    <cd:command name="middlebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="baselinemiddlebox" level="system" file="supp-box.mkiv">
+    <cd:command name="baselinemiddlebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="baselineleftbox" level="system" file="supp-box.mkiv">
+    <cd:command name="baselineleftbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="baselinerightbox" level="system" file="supp-box.mkiv">
+    <cd:command name="baselinerightbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lrtbbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lrtbbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -610,13 +610,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="toplinebox" level="system" file="supp-box.mkiv">
+    <cd:command name="toplinebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setstackbox" level="system" file="supp-box.mkiv">
+    <cd:command name="setstackbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -624,13 +624,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="initializeboxstack" level="system" file="supp-box.mkiv">
+    <cd:command name="initializeboxstack" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="savebox" level="system" file="supp-box.mkiv">
+    <cd:command name="savebox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -638,28 +638,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushbox" level="system" file="supp-box.mkiv">
+    <cd:command name="flushbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="restorebox" level="system" file="supp-box.mkiv">
+    <cd:command name="restorebox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="foundbox" level="system" file="supp-box.mkiv">
+    <cd:command name="foundbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsebox" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifelsebox" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -668,7 +668,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifboxelse" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifboxelse" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -677,51 +677,51 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpushbox" level="system" file="supp-box.mkiv">
+    <cd:command name="localpushbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpopbox" level="system" file="supp-box.mkiv">
+    <cd:command name="localpopbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpushbox" level="system" file="supp-box.mkiv">
+    <cd:command name="globalpushbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpopbox" level="system" file="supp-box.mkiv">
+    <cd:command name="globalpopbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removedepth" level="system" file="supp-box.mkiv"/>
+    <cd:command name="removedepth" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="obeydepth" level="system" file="supp-box.mkiv"/>
+    <cd:command name="obeydepth" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="undepthed" level="system" file="supp-box.mkiv">
+    <cd:command name="undepthed" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removebottomthings" level="system" file="supp-box.mkiv"/>
+    <cd:command name="removebottomthings" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="removelastskip" level="system" file="supp-box.mkiv"/>
+    <cd:command name="removelastskip" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="makestrutofbox" level="system" file="supp-box.mkiv">
+    <cd:command name="makestrutofbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="raisebox" level="system" file="supp-box.mkiv">
+    <cd:command name="raisebox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
@@ -729,7 +729,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lowerbox" level="system" file="supp-box.mkiv">
+    <cd:command name="lowerbox" level="system" category="boxes" keywords="alignment" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
@@ -737,213 +737,213 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="halfwaybox" level="system" file="supp-box.mkiv">
+    <cd:command name="halfwaybox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="depthonlybox" level="system" file="supp-box.mkiv">
+    <cd:command name="depthonlybox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalhbox" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturalhbox" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalvbox" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturalvbox" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalvtop" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturalvtop" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalvcenter" level="system" file="supp-box.mkiv">
+    <cd:command name="naturalvcenter" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalhpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturalhpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturalvpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturalvpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="naturaltpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="naturaltpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversehbox" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversehbox" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversevbox" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversevbox" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversevtop" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversevtop" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversehpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversehpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversevpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversevpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reversetpack" level="system" file="supp-dir.mkiv">
+    <cd:command name="reversetpack" level="system" category="boxes" file="supp-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="frozenhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="frozenhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setboxllx" level="system" file="supp-box.mkiv">
+    <cd:command name="setboxllx" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setboxlly" level="system" file="supp-box.mkiv">
+    <cd:command name="setboxlly" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gsetboxllx" level="system" file="supp-box.mkiv">
+    <cd:command name="gsetboxllx" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gsetboxlly" level="system" file="supp-box.mkiv">
+    <cd:command name="gsetboxlly" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getboxllx" level="system" file="supp-box.mkiv">
+    <cd:command name="getboxllx" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getboxlly" level="system" file="supp-box.mkiv">
+    <cd:command name="getboxlly" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directgetboxllx" level="system" file="supp-box.mkiv">
+    <cd:command name="directgetboxllx" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directgetboxlly" level="system" file="supp-box.mkiv">
+    <cd:command name="directgetboxlly" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shownextbox" level="system" file="supp-box.mkiv">
+    <cd:command name="shownextbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="spreadhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="spreadhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="minimalhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="minimalhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="nodetostring" level="system" file="supp-box.mkiv">
+    <cd:command name="nodetostring" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getnaturaldimensions" level="system" file="supp-box.mkiv">
+    <cd:command name="getnaturaldimensions" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lastnaturalboxwd" level="system" file="supp-box.mkiv"/>
+    <cd:command name="lastnaturalboxwd" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="lastnaturalboxht" level="system" file="supp-box.mkiv"/>
+    <cd:command name="lastnaturalboxht" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="lastnaturalboxdp" level="system" file="supp-box.mkiv"/>
+    <cd:command name="lastnaturalboxdp" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="naturalwd" level="system" file="supp-box.mkiv">
+    <cd:command name="naturalwd" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelserighttoleftinbox" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifelserighttoleftinbox" level="system" category="boxes" keywords="conditional direction" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-true"/>
@@ -951,7 +951,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifrighttoleftinboxelse" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifrighttoleftinboxelse" level="system" category="boxes" keywords="conditional direction" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:resolve name="argument-true"/>
@@ -959,209 +959,209 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="runninghbox" level="system" file="supp-box.mkiv">
+    <cd:command name="runninghbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/>
+    <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/>
+    <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/>
+    <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="setvboxregister" level="system" file="supp-box.mkiv">
+    <cd:command name="setvboxregister" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="sethboxregister" level="system" file="supp-box.mkiv">
+    <cd:command name="sethboxregister" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setvtopregister" level="system" file="supp-box.mkiv">
+    <cd:command name="setvtopregister" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushboxregister" level="system" file="supp-box.mkiv">
+    <cd:command name="flushboxregister" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vboxregister" type="environment" level="system" file="supp-box.mkiv">
+    <cd:command name="vboxregister" type="environment" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hboxregister" type="environment" level="system" file="supp-box.mkiv">
+    <cd:command name="hboxregister" type="environment" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vtopregister" type="environment" level="system" file="supp-box.mkiv">
+    <cd:command name="vtopregister" type="environment" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="righttolefthbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="righttolefthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rtlhbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="rtlhbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefttorighthbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="lefttorighthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ltrhbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="ltrhbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="righttoleftvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="righttoleftvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rtlvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="rtlvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefttorightvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="lefttorightvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ltrvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="ltrvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="righttoleftvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="righttoleftvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rtlvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="rtlvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lefttorightvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="lefttorightvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ltrvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="ltrvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autodirhbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="autodirhbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autodirvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="autodirvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autodirvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="autodirvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftorrighthbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="leftorrighthbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftorrightvbox" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="leftorrightvbox" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftorrightvtop" level="system" category="alignment" file="spac-ali.mkiv">
+    <cd:command name="leftorrightvtop" level="system" category="boxes" keywords="direction" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ibox" level="system" file="spac-ali.mkiv">
+    <cd:command name="ibox" level="system" category="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="obox" level="system" file="spac-ali.mkiv">
+    <cd:command name="obox" level="system" category="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definehbox" level="system" file="spac-ali.mkiv">
+    <cd:command name="definehbox" level="system" category="boxes" file="spac-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hbox" generated="yes" variant="example" level="system" file="spac-ali.mkiv">
+    <cd:command name="hbox" generated="yes" variant="example" level="system" category="boxes" file="spac-ali.mkiv">
         <cd:sequence>
             <cd:string value="hbox"/>
             <cd:variable value="box"/>
@@ -1171,9 +1171,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lastlinewidth" level="system" file="supp-box.mkiv"/>
+    <cd:command name="lastlinewidth" level="system" category="boxes" file="supp-box.mkiv"/>
 
-    <cd:command name="putboxincache" level="system" file="supp-box.mkiv">
+    <cd:command name="putboxincache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1184,7 +1184,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getboxfromcache" level="system" file="supp-box.mkiv">
+    <cd:command name="getboxfromcache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1195,7 +1195,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseboxincache" level="system" category="conditional" file="supp-box.mkiv">
+    <cd:command name="doifelseboxincache" level="system" category="boxes" keywords="conditional" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1207,7 +1207,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="copyboxfromcache" level="system" file="supp-box.mkiv">
+    <cd:command name="copyboxfromcache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1218,7 +1218,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directboxfromcache" level="system" file="supp-box.mkiv">
+    <cd:command name="directboxfromcache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1228,7 +1228,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directcopyboxfromcache" level="system" file="supp-box.mkiv">
+    <cd:command name="directcopyboxfromcache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -1238,13 +1238,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetboxesincache" level="system" file="supp-box.mkiv">
+    <cd:command name="resetboxesincache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="putnextboxincache" level="system" file="supp-box.mkiv">
+    <cd:command name="putnextboxincache" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml
index b166c84b1..b82b17ac5 100644
--- a/tex/context/interface/mkiv/i-buffer.xml
+++ b/tex/context/interface/mkiv/i-buffer.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="doifelsebuffer" level="system" category="buffer conditional" file="buff-ini.mkiv">
+    <cd:command name="doifelsebuffer" level="system" category="buffer" keywords="conditional" file="buff-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-buffer"/>
             <cd:resolve name="argument-true"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifbufferelse" level="system" category="buffer conditional" file="buff-ini.mkiv">
+    <cd:command name="doifbufferelse" level="system" category="buffer" keywords="conditional" file="buff-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-buffer"/>
             <cd:resolve name="argument-true"/>
@@ -156,7 +156,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ctxluabuffer" level="style" category="buffer lua" file="buff-ini.mkiv">
+    <cd:command name="ctxluabuffer" level="style" category="buffer" keywords="lua" file="buff-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-buffer-optional"/>
         </cd:arguments>
@@ -174,7 +174,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typebuffer" level="document" category="buffer verbatim" file="buff-ver.mkiv">
+    <cd:command name="typebuffer" level="document" category="buffer" keywords="verbatim" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-buffer-list-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -183,7 +183,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer verbatim" file="buff-ver.mkiv">
+    <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer" keywords="verbatim" file="buff-ver.mkiv">
         <cd:sequence>
             <cd:string value="type"/>
             <cd:instance value="buffer"/>
@@ -195,7 +195,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typedefinedbuffer" level="system" category="buffer verbatim" file="buff-ver.mkiv">
+    <cd:command name="typedefinedbuffer" level="system" category="buffer" keywords="verbatim" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-buffer"/>
             <cd:assignments list="yes" optional="yes">
@@ -204,7 +204,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv">
+    <cd:command name="prettyprintbuffer" level="style" category="buffer" keywords="verbatim" file="lxml-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-buffer"/>
             <cd:keywords delimiters="braces">
@@ -213,7 +213,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inlineprettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv">
+    <cd:command name="inlineprettyprintbuffer" level="style" category="buffer" keywords="verbatim" file="lxml-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-buffer"/>
             <cd:keywords delimiters="braces">
@@ -222,7 +222,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typeinlinebuffer" level="style" category="buffer verbatim" file="buff-ver.mkiv">
+    <cd:command name="typeinlinebuffer" level="style" category="buffer" keywords="verbatim" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-buffer-list-optional"/>
             <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml
index d7228c949..180738b79 100644
--- a/tex/context/interface/mkiv/i-button.xml
+++ b/tex/context/interface/mkiv/i-button.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definebutton" level="style" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="definebutton" level="style" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupbutton" level="style" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="setupbutton" level="style" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -49,7 +49,7 @@
 
     <!--
 
-        <cd:command name="setupbuttons" level="style" catehory="pdf" file="scrn-but.mkvi">
+        <cd:command name="setupbuttons" level="style" category="pdf" file="scrn-but.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -60,7 +60,7 @@
 
     -->
 
-    <cd:command name="button" generated="yes" variant="example" level="document" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="button" generated="yes" variant="example" level="document" category="pdf" file="scrn-but.mkvi">
         <cd:sequence>
             <cd:variable value="button"/>
         </cd:sequence>
@@ -76,7 +76,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="button" level="document" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="button" level="document" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupbutton"/>
@@ -86,32 +86,32 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="overlaybutton" level="style" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="overlaybutton" level="style" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="overlaybutton" variant="direct" level="style" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="overlaybutton" variant="direct" level="style" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-reference"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPmenubuttons" level="style" catehory="pdf" file="scrn-but.mkvi">
+    <cd:command name="MPmenubuttons" level="style" category="pdf" file="scrn-but.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="overlayrollbutton" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="overlayrollbutton" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definepushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="definepushbutton" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -120,14 +120,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="pushbutton" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definepushsymbol" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="definepushsymbol" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -140,7 +140,7 @@
 
     <!--
 
-        <cd:command name="psh" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi">
+        <cd:command name="psh" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
                 <cd:resolve name="string-text"/>
@@ -148,7 +148,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="psh" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi">
+        <cd:command name="psh" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
             </cd:arguments>
@@ -156,7 +156,7 @@
 
     -->
 
-    <cd:command name="rollbutton" variant="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="rollbutton" variant="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -167,7 +167,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rollbutton" variant="button" level="style" catehory="pdf" file="scrn-fld.mkvi">
+    <cd:command name="rollbutton" variant="button" level="style" category="pdf" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupbutton"/>
@@ -179,7 +179,7 @@
 
     <!--
 
-        <cd:command name="rob" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi">
+        <cd:command name="rob" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
                 <cd:resolve name="string-text"/>
@@ -187,7 +187,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="rob" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi">
+        <cd:command name="rob" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-fld.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
             </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml
index 75a17a0e4..4e112c491 100644
--- a/tex/context/interface/mkiv/i-catcodes.xml
+++ b/tex/context/interface/mkiv/i-catcodes.xml
@@ -120,4 +120,12 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="asciimode" level="document" category="catcode" file="math-ini.mkxl"/>
+
+    <cd:command name="enableasciimode" level="document" category="catcode" file="math-ini.mkxl"/>
+
+    <cd:command name="asciimode" type="environment" level="document" category="catcode" file="math-ini.mkxl"/>
+
+    <cd:command name="literalmode" level="document" category="catcode" file="buff-ver.mkiv"/>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-character.xml b/tex/context/interface/mkiv/i-character.xml
index 61d6a32a6..1c89a9fe3 100644
--- a/tex/context/interface/mkiv/i-character.xml
+++ b/tex/context/interface/mkiv/i-character.xml
@@ -62,32 +62,32 @@
 
     <cd:command name="letterexclamationmark" level="document" category="characters" file="catc-sym.mkiv"/>
 
-    <cd:command name="utfchar" level="document" category="characters fonts" file="char-ini.mkiv">
+    <cd:command name="utfchar" level="document" category="characters" keywords="fonts" file="char-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="safechar" level="style" category="characters fonts" file="char-ini.mkiv">
+    <cd:command name="safechar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkedchar" level="style" category="characters fonts" file="char-ini.mkiv">
+    <cd:command name="checkedchar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="textormathchar" level="style" category="characters fonts" file="char-ini.mkiv">
+    <cd:command name="textormathchar" level="style" category="characters" keywords="fonts" file="char-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-  <cd:command name="textormathchars" level="style" category="characters fonts" file="char-ini.mkiv">
+  <cd:command name="textormathchars" level="style" category="characters" keywords="fonts" file="char-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml
index d2aa3f9eb..2f5b85e2e 100644
--- a/tex/context/interface/mkiv/i-characteralign.xml
+++ b/tex/context/interface/mkiv/i-characteralign.xml
@@ -41,7 +41,7 @@
 
     <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/>
 
-    <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv">
+    <cd:command name="characteralign" type="environment" level="system" category="alignment" file="typo-tal.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupcharacteralign"/>
@@ -49,7 +49,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="characteralign" type="environment" variant="argument" category="alignment" level="system" file="typo-tal.mkiv">
+    <cd:command name="characteralign" type="environment" variant="argument" level="system" category="alignment" file="typo-tal.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="cd:text"/>
diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml
index 7f0a51393..d91e23cb2 100644
--- a/tex/context/interface/mkiv/i-chart.xml
+++ b/tex/context/interface/mkiv/i-chart.xml
@@ -6,7 +6,7 @@
 
     <!--
 
-        <cd:command name="setupFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi">
+        <cd:command name="setupFLOWchart" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -96,7 +96,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi">
+        <cd:command name="setupFLOWcharts" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -107,7 +107,7 @@
 
     -->
 
-    <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi">
+    <cd:command name="setupFLOWcharts" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="width">
@@ -202,7 +202,7 @@
     </cd:command>
 
     <!--
-       <cd:command name="setupFLOWline" level="style" category="graphics metapost" file="m-chart.mkvi">
+       <cd:command name="setupFLOWline" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -234,7 +234,7 @@
             </cd:arguments>
         </cd:command>
 
-       <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi">
+       <cd:command name="setupFLOWlines" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -245,7 +245,7 @@
 
     -->
 
-   <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="setupFLOWlines" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="corner">
@@ -278,7 +278,7 @@
 
     <!--
 
-       <cd:command name="setupFLOWshape" level="style" category="graphics metapost" file="m-chart.mkvi">
+       <cd:command name="setupFLOWshape" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -298,7 +298,7 @@
             </cd:arguments>
         </cd:command>
 
-       <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi">
+       <cd:command name="setupFLOWshapes" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -309,7 +309,7 @@
 
     -->
 
-   <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="setupFLOWshapes" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="default">
@@ -328,7 +328,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="setupFLOWfocus" level="style" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="setupFLOWfocus" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -345,7 +345,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="setupFLOWsplit" level="style" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="setupFLOWsplit" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -374,20 +374,20 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="FLOWchart" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="FLOWchart" type="environment" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="defineFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="defineFLOWchart" level="style" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="FLOWcell" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="FLOWcell" type="environment" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupFLOWshape"/>
@@ -398,7 +398,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="FLOWchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="FLOWchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -407,7 +407,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="FLOWcharts" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="FLOWcharts" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -416,13 +416,13 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="name" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="name" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="shape" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="shape" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-flowshape"/>
@@ -430,25 +430,25 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="destination" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="destination" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="focus" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="focus" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="overlay" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="overlay" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="location" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="location" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="-"/>
@@ -458,7 +458,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="figure" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="figure" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:file"/>
@@ -467,7 +467,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="text" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="text" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:resolve name="value-chartlabel"/>
@@ -476,7 +476,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="label" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="label" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:resolve name="value-chartlabel"/>
@@ -485,7 +485,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="comment" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="comment" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:resolve name="value-chartlabel"/>
@@ -494,7 +494,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="exit" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="exit" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:resolve name="value-chartlabel"/>
@@ -503,7 +503,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="connection" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="connection" scope="flowchart" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="+"/>
@@ -527,7 +527,7 @@
         </cd:arguments>
     </cd:command>
 
-   <cd:command name="include" level="document" category="graphics metapost" file="m-chart.mkvi">
+   <cd:command name="include" level="document" category="graphics" keywords="metapost" file="m-chart.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml
index 2d2498797..5b3ca602a 100644
--- a/tex/context/interface/mkiv/i-chemical.xml
+++ b/tex/context/interface/mkiv/i-chemical.xml
@@ -4,13 +4,13 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="molecule" level="document" file="chem-ini.mkiv">
+    <cd:command name="molecule" level="document" category="symbols" file="chem-ini.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="chem" level="document" file="chem-ini.mkiv">
+    <cd:command name="chem" level="document" category="symbols" file="chem-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-cleaning.xml b/tex/context/interface/mkiv/i-cleaning.xml
index f5f7b353a..f32372297 100644
--- a/tex/context/interface/mkiv/i-cleaning.xml
+++ b/tex/context/interface/mkiv/i-cleaning.xml
@@ -4,11 +4,11 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" file="typo-chr.mkiv"/>
+    <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" category="language" file="typo-chr.mkiv"/>
 
-    <cd:command name="removepunctuation" level="system" file="typo-chr.mkiv"/>
+    <cd:command name="removepunctuation" level="system" category="language" file="typo-chr.mkiv"/>
 
-    <cd:command name="markcontent" level="system" file="typo-chr.mkiv">
+    <cd:command name="markcontent" level="system" category="language" file="typo-chr.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="reset"/>
@@ -19,7 +19,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="markedcontent" type="environment" level="system" file="typo-chr.mkiv">
+    <cd:command name="markedcontent" type="environment" level="system" category="language" file="typo-chr.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="reset"/>
@@ -29,13 +29,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removemarkedcontent" level="system" file="typo-chr.mkiv">
+    <cd:command name="removemarkedcontent" level="system" category="language" file="typo-chr.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemarkedcontent" level="system" category="conditional" file="typo-chr.mkiv">
+    <cd:command name="doifelsemarkedcontent" level="system" category="language" keywords="conditional" file="typo-chr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -43,7 +43,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setcharactercleaning" level="system" file="typo-cln.mkiv">
+    <cd:command name="setcharactercleaning" level="system" category="language" file="typo-cln.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="reset"/>
diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml
index ee5597e95..09dd21563 100644
--- a/tex/context/interface/mkiv/i-color.xml
+++ b/tex/context/interface/mkiv/i-color.xml
@@ -435,7 +435,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecolor" level="system" category="colors conditional" file="color-ini.mkiv">
+    <cd:command name="doifelsecolor" level="system" category="colors" keywords="conditional" file="color-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-color"/>
             <cd:resolve name="argument-true"/>
@@ -443,7 +443,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcolorelse" level="system" category="colors conditional" file="color-ini.mkiv">
+    <cd:command name="doifcolorelse" level="system" category="colors" keywords="conditional" file="color-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-color"/>
             <cd:resolve name="argument-true"/>
@@ -451,7 +451,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcolor" level="system" category="colors conditional" file="color-ini.mkiv">
+    <cd:command name="doifcolor" level="system" category="colors" keywords="conditional" file="color-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-color"/>
             <cd:resolve name="argument-true"/>
@@ -518,7 +518,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseblack" level="system"  category="colors conditional" file="colo-ini.mkiv">
+    <cd:command name="doifelseblack" level="system"  category="colors" keywords="conditional" file="colo-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-color"/>
             <cd:resolve name="argument-true"/>
@@ -526,7 +526,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifblackelse" level="system" category="colors conditional" file="colo-ini.mkiv">
+    <cd:command name="doifblackelse" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-color"/>
             <cd:resolve name="argument-true"/>
@@ -534,14 +534,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedrawingblack" level="system" category="colors conditional" file="colo-ini.mkiv">
+    <cd:command name="doifelsedrawingblack" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdrawingblackelse" level="system" category="colors conditional" file="colo-ini.mkiv">
+    <cd:command name="doifdrawingblackelse" level="system" category="colors" keywords="conditional" file="colo-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml
index d2d07f06e..2a42e7873 100644
--- a/tex/context/interface/mkiv/i-combination.xml
+++ b/tex/context/interface/mkiv/i-combination.xml
@@ -111,7 +111,7 @@
 
     -->
 
-    <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="float tables" file="pack-com.mkiv">
+    <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="tables" keywords="float" file="pack-com.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="cd:matrix"/>
@@ -120,7 +120,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="floatcombination" type="environment" level="document" category="float tables" file="pack-com.mkiv">
+    <cd:command name="floatcombination" type="environment" level="document" category="tables" keywords="float" file="pack-com.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupcombination"/>
diff --git a/tex/context/interface/mkiv/i-commandhandler.xml b/tex/context/interface/mkiv/i-commandhandler.xml
index 6accac865..b16da06b5 100644
--- a/tex/context/interface/mkiv/i-commandhandler.xml
+++ b/tex/context/interface/mkiv/i-commandhandler.xml
@@ -4,42 +4,42 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="installparameterhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installrootparameterhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installrootparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installparameterhashhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installparameterhashhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installparametersethandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installparametersethandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installstyleandcolorhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installstyleandcolorhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdefinehandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdefinehandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -47,35 +47,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installsetuphandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installswitchsetuphandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installswitchsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installautosetuphandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installautosetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installbasicparameterhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installbasicparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installbasicautosetuphandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installbasicautosetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -83,7 +83,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installcommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -91,7 +91,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installswitchcommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installswitchcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -99,7 +99,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installautocommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installautocommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -107,7 +107,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installsimplecommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installsimplecommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -115,49 +115,49 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdirectparameterhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdirectparameterhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdirectsetuphandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdirectsetuphandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdirectparametersethandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdirectparametersethandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdirectstyleandcolorhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdirectstyleandcolorhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdirectcommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdirectcommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installsetuponlycommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installsetuponlycommandhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="relateparameterhandlers" level="system" file="mult-aux.mkiv">
+    <cd:command name="relateparameterhandlers" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -166,25 +166,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installactionhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="installactionhandler" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installnamespace" level="system" file="mult-aux.mkiv">
+    <cd:command name="installnamespace" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installcorenamespace" level="system" file="mult-aux.mkiv">
+    <cd:command name="installcorenamespace" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definenamespace" level="system" file="mult-aux.mkiv">
+    <cd:command name="definenamespace" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -221,16 +221,16 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="listnamespaces" level="system" file="mult-aux.mkiv"/>
+    <cd:command name="listnamespaces" level="system" category="commandhandler" file="mult-aux.mkiv"/>
 
-    <cd:command name="showparentchain" level="system" file="mult-aux.mkiv">
+    <cd:command name="showparentchain" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="doifelsecommandhandler" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -239,7 +239,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommandhandlerelse" level="system" file="mult-aux.mkiv">
+    <cd:command name="doifcommandhandlerelse" level="system" category="commandhandler"  keywords="conditional" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -248,7 +248,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="doifcommandhandler" level="system" category="commandhandler" keywords="conditional" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -256,7 +256,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotcommandhandler" level="system" file="mult-aux.mkiv">
+    <cd:command name="doifnotcommandhandler" level="system" category="commandhandler"  keywords="conditional" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -264,14 +264,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdefinitionset" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdefinitionset" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installdefinitionsetmember" level="system" file="mult-aux.mkiv">
+    <cd:command name="installdefinitionsetmember" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -280,14 +280,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installparentinjector" level="system" file="mult-aux.mkiv">
+    <cd:command name="installparentinjector" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installframedcommandhandler" level="system" file="pack-rul.mkiv">
+    <cd:command name="installframedcommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -295,7 +295,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installframedautocommandhandler" level="system" file="pack-rul.mkiv">
+    <cd:command name="installframedautocommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -303,7 +303,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installsimpleframedcommandhandler" level="system" file="pack-rul.mkiv">
+    <cd:command name="installsimpleframedcommandhandler" level="system" category="commandhandler" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
@@ -311,13 +311,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installmacrostack" level="system" file="mult-aux.mkiv">
+    <cd:command name="installmacrostack" level="system" category="system" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installglobalmacrostack" level="system" file="mult-aux.mkiv">
+    <cd:command name="installglobalmacrostack" level="system" category="system" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-common-assignment.xml b/tex/context/interface/mkiv/i-common-assignment.xml
index f9d296484..e5d219f05 100644
--- a/tex/context/interface/mkiv/i-common-assignment.xml
+++ b/tex/context/interface/mkiv/i-common-assignment.xml
@@ -27,6 +27,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:define>
 
@@ -50,6 +53,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:define>
 
diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml
index 19a4e18c7..d85325e3c 100644
--- a/tex/context/interface/mkiv/i-common-keyword.xml
+++ b/tex/context/interface/mkiv/i-common-keyword.xml
@@ -820,14 +820,31 @@
         </cd:keywords>
     </cd:define>
 
+    <!--        *    -->
+    <!-- \... [...]  -->
+    <!--             -->
+    <!-- * DIRECTIVE -->
+
+    <cd:define name="keyword-directive-list">
+        <cd:keywords list="yes">
+            <cd:resolve name="value-directive"/>
+        </cd:keywords>
+    </cd:define>
+
     <!--        *   -->
     <!-- \... [...] -->
     <!--            -->
-    <!-- * DIRECTIVE  -->
+    <!-- * DATE     -->
 
-    <cd:define name="keyword-directive-list">
+    <cd:define name="keyword-date-list">
         <cd:keywords list="yes">
-            <cd:resolve name="value-directive"/>
+            <cd:resolve name="value-date"/>
+        </cd:keywords>
+    </cd:define>
+
+    <cd:define name="keyword-date-list-optional">
+        <cd:keywords list="yes" optional="yes">
+            <cd:resolve name="value-date"/>
         </cd:keywords>
     </cd:define>
 
diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml
index c3caf1062..210320622 100644
--- a/tex/context/interface/mkiv/i-common-value.xml
+++ b/tex/context/interface/mkiv/i-common-value.xml
@@ -361,6 +361,8 @@
             <cd:constant type="et"/>
             <cd:constant type="kr"/>
             <cd:constant type="jp"/>
+            <cd:constant type="he"/>
+            <cd:constant type="yi"/>
         -->
         <cd:constant type="cd:language"/>
     </cd:define>
@@ -957,6 +959,75 @@
         <cd:constant type="simplefun"/>
     </cd:define>
 
+    <!-- date -->
+
+    <cd:define name="value-date">
+        <cd:constant type="year"/>
+        <cd:constant type="cd:name" prefix="year" method="range"/>
+        <cd:constant type="y"/>
+        <cd:constant type="cd:name" prefix="y" method="range"/>
+        <cd:constant type="yy"/>
+        <cd:constant type="Y"/>
+        <cd:constant type="cd:name" prefix="Y" method="range"/>
+        <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 type="cd:name" prefix="day" method="range"/>
+        <cd:constant type="day:+"/>
+        <cd:constant type="day:ord"/>
+        <cd:constant type="day:++"/>
+        <cd:constant type="day:highord"/>
+        <cd:constant type="d"/>
+        <cd:constant type="cd:name" prefix="d" method="range"/>
+        <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:define>
+
     <!-- tracker -->
 
     <cd:define name="value-tracker">
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index ca7a9bbbf..59f603a12 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml
index cb82fb4a4..2afbdfee2 100644
--- a/tex/context/interface/mkiv/i-context.xml
+++ b/tex/context/interface/mkiv/i-context.xml
@@ -181,6 +181,7 @@
     <cd:interfacefile filename="i-penalty.xml"/>
     <cd:interfacefile filename="i-periods.xml"/>
     <cd:interfacefile filename="i-phantom.xml"/>
+    <cd:interfacefile filename="i-placeholder.xml"/>
     <cd:interfacefile filename="i-placement.xml"/>
     <cd:interfacefile filename="i-position.xml"/>
     <cd:interfacefile filename="i-positionbar.xml"/>
diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml
index 4c8c9683e..e09bbd733 100644
--- a/tex/context/interface/mkiv/i-conversion.xml
+++ b/tex/context/interface/mkiv/i-conversion.xml
@@ -16,199 +16,211 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="romannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="romannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="Romannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="Romannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="abjadnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="abjadnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="abjadnodotnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="abjadnodotnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="abjadnaivenumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="abjadnaivenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="languagecharacters" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="hebrewnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="languageCharacters" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="yiddishnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="languagecharacters" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="Alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="languageCharacters" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thainumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="alphabeticnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="devanagarinumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="Alphabeticnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gurmurkhinumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="thainumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gujaratinumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="devanagarinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tibetannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="gurmurkhinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="greeknumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="gujaratinumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="Greeknumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="tibetannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="arabicnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="greeknumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="persiannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="Greeknumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="arabicdecimals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="arabicnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="persiandecimals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="persiannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="arabicexnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="arabicdecimals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="koreannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="persiandecimals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="koreannumeralsp" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="arabicexnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="koreannumeralsc" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="koreannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="koreanparentnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="koreannumeralsp" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="koreancirclenumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="koreannumeralsc" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="chinesenumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="koreanparentnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="chinesecapnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="koreancirclenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="chineseallnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="chinesenumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="character" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="chinesecapnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="Character" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="chineseallnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="characters" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="character" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="Characters" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="Character" level="style" category="counter" keywords="language" file="core-con.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-number"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="characters" level="style" category="counter" keywords="language" file="core-con.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-number"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="Characters" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
@@ -308,7 +320,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseleapyear" level="style" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifelseleapyear" level="style" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -316,7 +328,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifleapyearelse" level="style" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifleapyearelse" level="style" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -338,63 +350,26 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentdate" level="document" category="counter language" file="core-con.mkiv">
+    <cd:command name="definedate" level="document" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:constant type="year"/>
-                <cd:constant type="y"/>
-                <cd:constant type="yy"/>
-                <cd:constant type="Y"/>
-                <cd:constant type="YY"/>
-                <cd:constant type="month"/>
-                <cd:constant type="month:mnem"/>
-                <cd:constant type="month:jalali"/>
-                <cd:constant type="m"/>
-                <cd:constant type="m:mnem"/>
-                <cd:constant type="m:jalali"/>
-                <cd:constant type="MONTH"/>
-                <cd:constant type="MONTH:mnem"/>
-                <cd:constant type="MONTH:jalali"/>
-                <cd:constant type="mm"/>
-                <cd:constant type="M"/>
-                <cd:constant type="day"/>
-                <cd:constant type="day:+"/>
-                <cd:constant type="day:ord"/>
-                <cd:constant type="day:++"/>
-                <cd:constant type="day: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="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="w"/>
-                <cd:constant type="w:mnem"/>
-                <cd:constant type="WEEKDAY"/>
-                <cd:constant type="WEEKDAY:mnem"/>
-                <cd:constant type="W"/>
-                <cd:constant type="referral"/>
-                <cd:constant type="space"/>
-                <cd:constant type="\␣"/>
-                <cd:constant type="cd:text"/>
-                <cd:constant type="jalali:to"/>
-                <cd:constant type="jalali:from"/>
-            </cd:keywords>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="keyword-date-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="date" level="document" category="counter language" file="core-con.mkiv">
+    <cd:command name="currentdate" level="document" category="counter" keywords="language" file="core-con.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-date-list-optional"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="currentdate" variant="name" level="document" category="counter" keywords="language" file="core-con.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-optional"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="date" level="document" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="d">
@@ -407,9 +382,24 @@
                     <cd:constant type="cd:number"/>
                 </cd:parameter>
             </cd:assignments>
-            <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="currentdate"/>
-            </cd:keywords>
+            <cd:resolve name="keyword-date-list-optional"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="date" variant="name" level="document" category="counter" keywords="language" file="core-con.mkiv">
+        <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:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
@@ -456,7 +446,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineconversion" variant="list" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="defineconversion" variant="list" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-language-optional"/>
             <cd:resolve name="keyword-name"/>
@@ -504,6 +494,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"/>
@@ -556,7 +548,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseconversiondefined" level="system" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifelseconversiondefined" level="system" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -564,7 +556,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifconversiondefinedelse" level="system" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifconversiondefinedelse" level="system" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -572,7 +564,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseconversionnumber" level="system" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifelseconversionnumber" level="system" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -581,7 +573,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifconversionnumberelse" level="system" category="counter conditional" file="core-con.mkiv">
+    <cd:command name="doifconversionnumberelse" level="system" category="counter" keywords="conditional" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -645,37 +637,37 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="sloveniannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="sloveniannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="slovenianNumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="slovenianNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="spanishnumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="spanishnumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="spanishNumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="spanishNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="russiannumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="russiannumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="russianNumerals" level="style" category="counter language" file="core-con.mkiv">
+    <cd:command name="russianNumerals" level="style" category="counter" keywords="language" file="core-con.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
@@ -699,11 +691,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="actualyear" level="style" category="system" file="core-con.lua"/>
+    <cd:command name="actualyear" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/>
 
-    <cd:command name="actualmonth" level="style" category="system" file="core-con.lua"/>
+    <cd:command name="actualmonth" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/>
 
-    <cd:command name="actualday" level="style" category="system" file="core-con.lua"/>
+    <cd:command name="actualday" level="style" category="system" keywords="system" category="counter" file="core-con.lua"/>
 
     <cd:command name="lchexnumber" level="style" category="counter" file="syst-con.mkxl">
         <cd:arguments>
diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml
index bba8004f0..7879fe27d 100644
--- a/tex/context/interface/mkiv/i-counter.xml
+++ b/tex/context/interface/mkiv/i-counter.xml
@@ -111,7 +111,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifelsecounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -119,7 +119,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcounterelse" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifcounterelse" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -127,14 +127,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotcounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifnotcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -360,7 +360,7 @@
         </cd:arguments>
     </cd:command>
     
-    <cd:command name="doifelsedefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifelsedefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -368,7 +368,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefinedcounterelse" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifdefinedcounterelse" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -376,14 +376,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifdefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifundefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv">
+    <cd:command name="doifundefinedcounter" level="system" category="counter" keywords="conditional" file="strc-num.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-database.xml b/tex/context/interface/mkiv/i-database.xml
index 24ae7ac1e..e974b2d64 100644
--- a/tex/context/interface/mkiv/i-database.xml
+++ b/tex/context/interface/mkiv/i-database.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definedatabase" level="style" file="m-database.mkiv">
+    <cd:command name="definedatabase" level="style" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupdatabase" level="style" file="m-database.mkiv">
+    <cd:command name="setupdatabase" level="style" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -64,21 +64,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processdatabasebuffer" level="document" file="m-database.mkiv">
+    <cd:command name="processdatabasebuffer" level="document" category="tables" keywords="buffer" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-buffer"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processdatabasefile" level="document" file="m-database.mkiv">
+    <cd:command name="processdatabasefile" level="document" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineseparatedlist" level="style" file="m-database.mkiv">
+    <cd:command name="defineseparatedlist" level="style" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -87,26 +87,26 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processseparatedlist" level="document" file="m-database.mkiv">
+    <cd:command name="processseparatedlist" level="document" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" level="document" file="m-database.mkiv">
+    <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" level="document" category="tables" file="m-database.mkiv">
         <cd:sequence>
             <cd:instance value="separatedlist"/>
         </cd:sequence>
     </cd:command>
 
-    <cd:command name="separatedlist" type="environment" level="document" file="m-database.mkiv">
+    <cd:command name="separatedlist" type="environment" level="document" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupseparatedlist" level="style" file="m-database.mkiv">
+    <cd:command name="setupseparatedlist" level="style" category="tables" file="m-database.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
diff --git a/tex/context/interface/mkiv/i-digits.xml b/tex/context/interface/mkiv/i-digits.xml
index f962ac734..159745b65 100644
--- a/tex/context/interface/mkiv/i-digits.xml
+++ b/tex/context/interface/mkiv/i-digits.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setdigitsmanipulation" level="system" file="typo-dig.mkiv">
+    <cd:command name="setdigitsmanipulation" level="system" category="symbols" keywords="fonts" file="typo-dig.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="reset"/>
@@ -13,14 +13,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetdigitsmanipulation" level="system" file="typo-dig.mkiv"/>
+    <cd:command name="resetdigitsmanipulation" level="system" category="symbols" keywords="fonts" file="typo-dig.mkiv"/>
 
-    <cd:command name="equaldigits" level="document" file="typo-dig.mkiv">
+    <cd:command name="equaldigits" level="document" category="symbols" keywords="fonts" file="typo-dig.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dummydigit" level="document" file="typo-dig.mkiv"/>
+    <cd:command name="dummydigit" level="document" category="symbols" keywords="fonts" file="typo-dig.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml
index a29314549..721e7c60e 100644
--- a/tex/context/interface/mkiv/i-direction.xml
+++ b/tex/context/interface/mkiv/i-direction.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupdirections" level="style" category="language alignment" file="typo-dir.mkiv">
+    <cd:command name="setupdirections" level="style" category="language" keywords="alignment" file="typo-dir.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="bidi">
@@ -30,26 +30,26 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setdirection" level="style" category="language alignment" file="typo-dir.mkiv">
+    <cd:command name="setdirection" level="style" category="language" keywords="alignment" file="typo-dir.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetdirection" level="style" category="language alignment" file="typo-dir.mkiv"/>
+    <cd:command name="resetdirection" level="style" category="language" keywords="alignment" file="typo-dir.mkiv"/>
 
     <!--
 
-        <cd:command name="lefttorightmark" level="system" category="language alignment" file="typo-dir.mkiv"/>
+        <cd:command name="lefttorightmark" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/>
 
-        <cd:command name="righttoleftmark" level="system" category="language alignment" file="typo-dir.mkiv"/>
+        <cd:command name="righttoleftmark" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/>
 
-        <cd:command name="lrm" level="system" category="language alignment" file="typo-dir.mkiv"/>
+        <cd:command name="lrm" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/>
 
-        <cd:command name="rlm" level="system" category="language alignment" file="typo-dir.mkiv"/>
+        <cd:command name="rlm" level="system" category="language" keywords="alignment" file="typo-dir.mkiv"/>
 
     -->
 
-    <cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/>
+    <cd:command name="showdirsinmargin" level="document" category="alignment" keywords="alignment" file="supp-dir.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml
index dfb3bcf5b..1ee66cdac 100644
--- a/tex/context/interface/mkiv/i-dummy.xml
+++ b/tex/context/interface/mkiv/i-dummy.xml
@@ -4,52 +4,52 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="getdummyparameters" level="system" file="mult-aux.mkiv">
+    <cd:command name="getdummyparameters" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dummyparameter" level="system" file="mult-aux.mkiv">
+    <cd:command name="dummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directdummyparameter" level="system" file="mult-aux.mkiv">
+    <cd:command name="directdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setdummyparameter" level="system" file="mult-aux.mkiv">
+    <cd:command name="setdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letdummyparameter" level="system" file="mult-aux.mkiv">
+    <cd:command name="letdummyparameter" level="system" category="commandhandler" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usedummystyleandcolor" level="system" category="fonts colors" file="mult-aux.mkiv">
+    <cd:command name="usedummystyleandcolor" level="system" category="commandhandler" keywords="fonts colors" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usedummystyleparameter" level="system" category="fonts" file="mult-aux.mkiv">
+    <cd:command name="usedummystyleparameter" level="system" category="commandhandler" keywords="fonts" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usedummycolorparameter" level="system" category="colors" file="mult-aux.mkiv">
+    <cd:command name="usedummycolorparameter" level="system" category="commandhandler" keywords="colors" file="mult-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml
index 04f947144..5d4aeb101 100644
--- a/tex/context/interface/mkiv/i-field.xml
+++ b/tex/context/interface/mkiv/i-field.xml
@@ -133,7 +133,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefieldcategory" level="system" category="pdf conditional" file="scrn-fld.mkvi">
+    <cd:command name="doifelsefieldcategory" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -141,7 +141,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffieldcategoryelse" level="system" category="pdf conditional" file="scrn-fld.mkvi">
+    <cd:command name="doiffieldcategoryelse" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -187,7 +187,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefieldbody" level="system" category="pdf conditional" file="scrn-fld.mkvi">
+    <cd:command name="doifelsefieldbody" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -195,7 +195,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffieldbodyelse" level="system" category="pdf conditional" file="scrn-fld.mkvi">
+    <cd:command name="doiffieldbodyelse" level="system" category="pdf" keywords="conditional" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -245,7 +245,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fitfieldframed" level="document" category="pdf background rules" file="scrn-fld.mkvi">
+    <cd:command name="fitfieldframed" level="document" category="pdf" keywords="background rules" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -263,7 +263,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfieldlabelframed" level="style" category="pdf background" file="scrn-fld.mkvi">
+    <cd:command name="setupfieldlabelframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -272,7 +272,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfieldcontentframed" level="style" category="pdf background" file="scrn-fld.mkvi">
+    <cd:command name="setupfieldcontentframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -282,7 +282,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfieldtotalframed" level="style" category="pdf background" file="scrn-fld.mkvi">
+    <cd:command name="setupfieldtotalframed" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -310,7 +310,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfield" level="style" category="pdf background" file="scrn-fld.mkvi">
+    <cd:command name="setupfield" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -332,7 +332,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfields" level="style" category="pdf background" file="scrn-fld.mkvi">
+    <cd:command name="setupfields" level="style" category="pdf" keywords="background" file="scrn-fld.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="reset"/>
diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml
index df649e8e0..671f637ab 100644
--- a/tex/context/interface/mkiv/i-file.xml
+++ b/tex/context/interface/mkiv/i-file.xml
@@ -16,21 +16,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffile" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doiffile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotfile" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifnotfile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefile" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifelsefile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -38,7 +38,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffileelse" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doiffileelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -72,7 +72,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepath" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifelsepath" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-true"/>
@@ -80,7 +80,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpathelse" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifpathelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-true"/>
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefileexists" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifelsefileexists" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -96,7 +96,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffileexistselse" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doiffileexistselse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -104,7 +104,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepathexists" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifelsepathexists" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-true"/>
@@ -112,7 +112,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpathexistselse" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifpathexistselse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-true"/>
@@ -120,7 +120,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseparentfile" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifelseparentfile" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -128,7 +128,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifparentfileelse" level="system" category="structure conditional" file="file-ini.mkvi">
+    <cd:command name="doifparentfileelse" level="system" category="structure" keywords="conditional" file="file-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -156,7 +156,7 @@
 
     <cd:command name="splitoffroot" level="system" category="structure" file="file-ini.mkvi"/>
 
-    <cd:command name="doifelseinputfile" level="system" category="structure conditional" file="file-job.mkvi">
+    <cd:command name="doifelseinputfile" level="system" category="structure" keywords="conditional" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -164,7 +164,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinputfileelse" level="system" category="structure conditional" file="file-job.mkvi">
+    <cd:command name="doifinputfileelse" level="system" category="structure" keywords="conditional" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -239,13 +239,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadluafile" level="system" category="structure lua" file="file-job.mkvi">
+    <cd:command name="loadluafile" level="system" category="structure" keywords="lua" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadcldfile" level="system" category="structure lua" file="file-job.mkvi">
+    <cd:command name="loadcldfile" level="system" category="structure" keywords="lua" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
@@ -263,13 +263,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadluafileonce" level="system" category="structure lua" file="file-job.mkvi">
+    <cd:command name="loadluafileonce" level="system" category="structure" keywords="lua" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="loadcldfileonce" level="system" category="structure lua" file="file-job.mkvi">
+    <cd:command name="loadcldfileonce" level="system" category="structure" keywords="lua" file="file-job.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
@@ -293,7 +293,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readjobfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readjobfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -301,7 +301,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readlocfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readlocfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -309,7 +309,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readsysfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readsysfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -317,7 +317,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readfixfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readfixfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-file"/>
@@ -326,7 +326,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readsetfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readsetfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-path"/>
             <cd:resolve name="argument-file"/>
@@ -335,7 +335,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -349,7 +349,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readtexfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="readtexfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -357,7 +357,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="readxmlfile" level="system" category="structure conditional xml" file="file-res.mkvi">
+    <cd:command name="readxmlfile" level="system" category="structure" keywords="conditional xml" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -365,7 +365,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselocfile" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="doifelselocfile" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -373,7 +373,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflocfileelse" level="system" category="structure conditional" file="file-res.mkvi">
+    <cd:command name="doiflocfileelse" level="system" category="structure" keywords="conditional" file="file-res.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -407,4 +407,10 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="usefontpath" level="system" category="structure" keywords="fonts" file="font-ini.mklx">
+        <cd:arguments>
+            <cd:resolve name="keyword-path-list"/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml
index d9a43378e..078dc4b7a 100644
--- a/tex/context/interface/mkiv/i-filler.xml
+++ b/tex/context/interface/mkiv/i-filler.xml
@@ -127,7 +127,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="dotfill" level="document" category="rules" file="spac-flr.mkiv"/>
+
+    <cd:command name="definelinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -137,7 +139,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setuplinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -191,7 +193,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setuplinefillers" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -200,7 +202,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="linefiller" type="environment" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="filler"/>
@@ -212,7 +214,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setlinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="filler"/>
diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml
index 074326769..052d135d1 100644
--- a/tex/context/interface/mkiv/i-firstline.xml
+++ b/tex/context/interface/mkiv/i-firstline.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definefirstline" level="style" category="fonts colors" file="typo-fln.mkiv">
+    <cd:command name="definefirstline" level="style" category="fonts" keywords="colors" file="typo-fln.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfirstline" level="style" category="fonts colors" file="typo-fln.mkiv">
+    <cd:command name="setupfirstline" level="style" category="fonts" keywords="colors" file="typo-fln.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -36,13 +36,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setfirstline" level="document" category="fonts colors" file="typo-fln.mkiv">
+    <cd:command name="setfirstline" level="document" category="fonts" keywords="colors" file="typo-fln.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applytofirstcharacter" level="system" category="fonts colors" file="typo-fln.mkiv">
+    <cd:command name="applytofirstcharacter" level="system" category="fonts" keywords="colors" file="typo-fln.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml
index 309e6c542..ce872a33a 100644
--- a/tex/context/interface/mkiv/i-fittingpage.xml
+++ b/tex/context/interface/mkiv/i-fittingpage.xml
@@ -28,7 +28,7 @@
         </cd:assignments>
     </cd:define>
 
-    <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv">
+    <cd:command name="definefittingpage" level="style" category="layout" keywords="background" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -38,14 +38,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv">
+    <cd:command name="setupfittingpage" level="style" category="layout" keywords="background" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:resolve name="assignment-setupfittingpage"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fittingpage" type="environment" level="document" category="background layout" file="page-app.mkiv">
+    <cd:command name="fittingpage" type="environment" level="document" category="layout" keywords="background" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -54,7 +54,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="background layout" file="page-app.mkiv">
+    <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="layout" keywords="background" file="page-app.mkiv">
         <cd:sequence>
             <cd:instance value="fittingpage"/>
         </cd:sequence>
@@ -70,7 +70,7 @@
 
     <!--
 
-        <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv">
+        <cd:command name="setupTEXpage" level="style" category="layout" keywords="background" file="page-app.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes">
                     <cd:inherit name="setupfittingpage"/>
@@ -78,7 +78,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv">
+        <cd:command name="setupMPpage" level="style" category="layout" keywords="background metapost" file="meta-fig.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes">
                     <cd:inherit name="setupfittingpage"/>
@@ -88,13 +88,13 @@
 
     -->
 
-    <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv">
+    <cd:command name="setupTEXpage" level="style" category="layout" keywords="background" file="page-app.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-setupfittingpage"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv">
+    <cd:command name="setupMPpage" level="style" category="layout" keywords="background metapost" file="meta-fig.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-setupfittingpage"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml
index afb945e3e..26d20adef 100644
--- a/tex/context/interface/mkiv/i-floats.xml
+++ b/tex/context/interface/mkiv/i-floats.xml
@@ -239,7 +239,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+        <cd:command name="setupfloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -363,7 +363,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+        <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -372,7 +372,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+        <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -383,7 +383,7 @@
 
     -->
 
-    <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+    <cd:command name="setupcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -512,7 +512,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+    <cd:command name="setupcaptions" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -521,7 +521,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi">
+    <cd:command name="placefloatcaption" level="style" category="structure" keywords="fonts counter" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -547,7 +547,7 @@
 
     <!--
 
-        <cd:command name="definefloatframed" level="style" category="structure background" file="strc-flt.mkvi">
+        <cd:command name="definefloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -559,7 +559,7 @@
 
     -->
 
-    <cd:command name="setupfloatframed" level="style" category="structure background" file="strc-flt.mkvi">
+    <cd:command name="setupfloatframed" level="style" category="structure" keywords="background" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -667,42 +667,42 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelserightpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifelserightpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifrightpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifrightpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseoddpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifelseoddpagefloat" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoddpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifoddpagefloatelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemainfloatbody" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifelsemainfloatbody" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi">
+    <cd:command name="doifmainfloatbodyelse" level="system" category="structure" keywords="conditional" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
@@ -939,7 +939,7 @@
 
     <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/>
 
-    <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv">
+    <cd:command name="setupfloatsplitting" level="style" category="structure" keywords="counter" file="tabl-tsp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="before">
@@ -972,7 +972,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv">
+    <cd:command name="doifnotinsidesplitfloat" level="system" category="structure" keywords="conditional" file="tabl-tsp.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml
index 08a8974a9..7cb1cbe99 100644
--- a/tex/context/interface/mkiv/i-fonts.xml
+++ b/tex/context/interface/mkiv/i-fonts.xml
@@ -334,7 +334,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addfeature" category="fonts" level="style" file="font-fea.mkvi">
+    <cd:command name="addfeature" level="style" category="fonts" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
@@ -434,14 +434,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts conditional" file="font-fea.mkvi">
+    <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
-    <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi">
+    <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -449,14 +449,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefontfeature" level="system" category="fonts conditional" file="font-fea.mkvi">
+    <cd:command name="doifelsefontfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
-    <cd:command name="doiffontfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi">
+    <cd:command name="doiffontfeatureelse" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -464,7 +464,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifunknownfontfeature" level="system" category="fonts conditional" file="font-fea.mkvi">
+    <cd:command name="doifunknownfontfeature" level="system" category="fonts" keywords="conditional" file="font-fea.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -569,7 +569,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefontsynonym" level="system" category="fonts conditional" file="font-fil.mkvi">
+    <cd:command name="doifelsefontsynonym" level="system" category="fonts" keywords="conditional" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -577,7 +577,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontsynonymelse" level="system" category="fonts conditional" file="font-fil.mkvi">
+    <cd:command name="doiffontsynonymelse" level="system" category="fonts" keywords="conditional" file="font-fil.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -1417,14 +1417,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseitalic" level="system" category="fonts conditional" file="font-sym.mkvi">
+    <cd:command name="doifelseitalic" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifitalicelse" level="system" category="fonts conditional" file="font-sym.mkvi">
+    <cd:command name="doifitalicelse" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
@@ -1503,7 +1503,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefontchar" level="system" category="fonts conditional" file="font-sym.mkvi">
+    <cd:command name="doifelsefontchar" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-number"/>
@@ -1512,7 +1512,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontcharelse" level="system" category="fonts conditional" file="font-sym.mkvi">
+    <cd:command name="doiffontcharelse" level="system" category="fonts" keywords="conditional" file="font-sym.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-number"/>
@@ -1529,7 +1529,7 @@
 
     <cd:command name="showfontdata" level="document" category="fonts" file="font-tra.mkiv"/>
 
-    <cd:command name="doifelsefontpresent" level="system" category="fonts conditional" file="font-tra.mkiv">
+    <cd:command name="doifelsefontpresent" level="system" category="fonts" keywords="conditional" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-true"/>
@@ -1537,7 +1537,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffontpresentelse" level="system" category="fonts conditional" file="font-tra.mkiv">
+    <cd:command name="doiffontpresentelse" level="system" category="fonts" keywords="conditional" file="font-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
             <cd:resolve name="argument-true"/>
@@ -1762,14 +1762,6 @@
         </cd:arguments>
     </cd:command>
 
-    <!-- question for ws: maybe move to i-file with ... level="system" category="structure" ... -->
-
-    <cd:command name="addfontpath" level="style" category="fonts" file="font-ini.mkvi">
-        <cd:arguments>
-            <cd:resolve name="keyword-path-list"/>
-        </cd:arguments>
-    </cd:command>
-
     <cd:command name="defineexpansion" level="style" category="fonts" file="hand-ini.mkx">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml
index a2146bc8d..80eed65d9 100644
--- a/tex/context/interface/mkiv/i-fraction.xml
+++ b/tex/context/interface/mkiv/i-fraction.xml
@@ -45,6 +45,7 @@
                     <cd:constant type="yes"/>
                     <cd:constant type="no"/>
                     <cd:constant type="auto" default="yes"/>
+                    <cd:constant type="hidden"/>
                 </cd:parameter>
                 <cd:parameter name="left">
                     <cd:constant type="cd:number"/>
diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml
index c3b9a0419..10fbd6c37 100644
--- a/tex/context/interface/mkiv/i-framed.xml
+++ b/tex/context/interface/mkiv/i-framed.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineframed" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="defineframed" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframed" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="setupframed" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -238,19 +238,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="frameddimension" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="frameddimension" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedparameter" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framedparameter" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framed" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -259,7 +259,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framed" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:instance value="framed"/>
         </cd:sequence>
@@ -274,7 +274,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="normalframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="normalframedwithsettings" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupframed"/>
@@ -283,7 +283,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framed" type="environment" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framed" type="environment" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -292,7 +292,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastlocalframed" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="fastlocalframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -302,7 +302,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localframed" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="localframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -312,14 +312,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directlocalframed" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="directlocalframed" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="localframedwithsettings" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -329,7 +329,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placeframed" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="placeframed" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -339,7 +339,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inframed" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="inframed" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -350,7 +350,7 @@
 
     <!--
 
-        <cd:command name="unframed" level="document" category="background rules" file="pack-rul.mkiv">
+        <cd:command name="unframed" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupframed"/>
@@ -361,7 +361,7 @@
 
     -->
 
-    <cd:command name="definemathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv">
+    <cd:command name="definemathframed" level="style" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -371,7 +371,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv">
+    <cd:command name="setupmathframed" level="style" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -380,7 +380,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="background rules mathematics" file="pack-rul.mkiv">
+    <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:instance value="mathframed"/>
         </cd:sequence>
@@ -397,7 +397,7 @@
 
     <!--
 
-        <cd:command name="mframed" level="document" category="background rules mathematics" file="pack-rul.mkiv">
+        <cd:command name="mframed" level="document" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathframed"/>
@@ -406,7 +406,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="inmframed" level="document" category="background rules mathematics" file="pack-rul.mkiv">
+        <cd:command name="inmframed" level="document" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathframed"/>
@@ -415,7 +415,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="mcframed" level="document" category="background rules mathematics" file="pack-rul.mkiv">
+        <cd:command name="mcframed" level="document" category="rules" keywords="background mathematics" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathframed"/>
@@ -426,7 +426,7 @@
 
     -->
 
-    <cd:command name="defineformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv">
+    <cd:command name="defineformulaframed" level="style" category="rules" keywords="background mathematics" file="math-for.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -436,7 +436,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv">
+    <cd:command name="setupformulaframed" level="style" category="rules" keywords="background mathematics" file="math-for.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -445,7 +445,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineframedtext" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="defineframedtext" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -455,7 +455,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtext" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="setupframedtext" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -496,7 +496,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtexts" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="setupframedtexts" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -505,7 +505,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:instance value="framedtext"/>
         </cd:sequence>
@@ -520,7 +520,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:sequence>
             <cd:instance value="framedtext"/>
         </cd:sequence>
@@ -542,7 +542,7 @@
 
     <!--
 
-        <cd:command name="framedtext" level="document" category="background rules" file="pack-rul.mkiv">
+        <cd:command name="framedtext" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupframedtext"/>
@@ -551,7 +551,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="framedtext" type="environment" level="document" category="background rules" file="pack-rul.mkiv">
+        <cd:command name="framedtext" type="environment" level="document" category="rules" keywords="background" file="pack-rul.mkiv">
             <cd:arguments>
                 <cd:keywords optional="yes">
                     <cd:constant type="left"/>
@@ -567,7 +567,7 @@
 
     -->
 
-    <cd:command name="defineframedcontent" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="defineframedcontent" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -577,7 +577,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedcontent" level="style" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="setupframedcontent" level="style" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -608,7 +608,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedcontent" type="environment" level="system" category="background rules" file="pack-rul.mkiv">
+    <cd:command name="framedcontent" type="environment" level="system" category="rules" keywords="background" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="cd:name"/>
@@ -617,35 +617,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installleftframerenderer" level="system" category="background rules" file="pack-fen.mkiv">
+    <cd:command name="installleftframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installrightframerenderer" level="system" category="background rules" file="pack-fen.mkiv">
+    <cd:command name="installrightframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installtopframerenderer" level="system" category="background rules" file="pack-fen.mkiv">
+    <cd:command name="installtopframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installbottomframerenderer" level="system" category="background rules" file="pack-fen.mkiv">
+    <cd:command name="installbottomframerenderer" level="system" category="rules" keywords="background" file="pack-fen.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseframed" level="system" category="background rules">
+    <cd:command name="doifelseframed" level="system" category="rules" keywords="background conditional" file="pack-rul.mkxl">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-framedtable.xml b/tex/context/interface/mkiv/i-framedtable.xml
index db985b3b9..4bea7ab9e 100644
--- a/tex/context/interface/mkiv/i-framedtable.xml
+++ b/tex/context/interface/mkiv/i-framedtable.xml
@@ -4,14 +4,14 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineframedtable" level="style" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="defineframedtable" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtable" level="style" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="setupframedtable" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes">
@@ -32,7 +32,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtablerow" level="style" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="setupframedtablerow" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:keywords>
@@ -45,7 +45,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupframedtablecolumn" level="style" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="setupframedtablecolumn" level="style" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:keywords>
@@ -58,7 +58,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedtable" type="environment" level="document" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="framedtable" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -67,7 +67,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedrow" type="environment" level="document" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="framedrow" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
@@ -75,7 +75,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="framedcell" type="environment" level="document" category="tables" file="tabl-frm.mkiv">
+    <cd:command name="framedcell" type="environment" level="document" category="tables" keywords="background rules" file="tabl-frm.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupframed"/>
diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml
index 222d7e93f..518706f35 100644
--- a/tex/context/interface/mkiv/i-graphics.xml
+++ b/tex/context/interface/mkiv/i-graphics.xml
@@ -319,7 +319,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefigure" level="system" category="graphics conditional" file="grph-inc.mkiv">
+    <cd:command name="doifelsefigure" level="system" category="graphics" keywords="conditional" file="grph-inc.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -327,7 +327,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffigureelse" level="system" category="graphics conditional" file="grph-inc.mkiv">
+    <cd:command name="doiffigureelse" level="system" category="graphics" keywords="conditional" file="grph-inc.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -479,7 +479,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typesetbuffer" level="document" category="graphics buffer" file="grph-fig.mkiv">
+    <cd:command name="typesetbuffer" level="document" category="graphics" keywords="buffer" file="grph-fig.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="*"/>
@@ -491,7 +491,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typesetbufferonly" level="document" category="graphics buffer" file="grph-fig.mkiv">
+    <cd:command name="typesetbufferonly" level="document" category="graphics" keywords="buffer" file="grph-fig.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="*"/>
@@ -500,7 +500,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definetypesetting" level="style" category="graphics structure" file="grph-fig.mkiv">
+    <cd:command name="definetypesetting" level="style" category="graphics" keywords="structure" file="grph-fig.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-text-optional"/>
@@ -510,7 +510,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typesetfile" level="document" category="graphics structure" file="grph-fig.mkiv">
+    <cd:command name="typesetfile" level="document" category="graphics" keywords="structure" file="grph-fig.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:name"/>
diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml
index f1cd9907f..ea8f0bc94 100644
--- a/tex/context/interface/mkiv/i-help.xml
+++ b/tex/context/interface/mkiv/i-help.xml
@@ -49,14 +49,14 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="doifelsehelp" level="system" category="pdf conditional" file="scrn-hlp.mkvi">
+    <cd:command name="doifelsehelp" level="system" category="pdf" keywords="conditional" file="scrn-hlp.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifhelpelse" level="system" category="pdf conditional" file="scrn-hlp.mkvi">
+    <cd:command name="doifhelpelse" level="system" category="pdf" keywords="conditional" file="scrn-hlp.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-hemistich.xml b/tex/context/interface/mkiv/i-hemistich.xml
index 9337315cd..0fbe5e863 100644
--- a/tex/context/interface/mkiv/i-hemistich.xml
+++ b/tex/context/interface/mkiv/i-hemistich.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definehemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="definehemistich" level="style" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuphemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="setuphemistich" level="style" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -50,7 +50,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hemistiches" level="document" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="hemistiches" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="argument-text"/>
@@ -58,7 +58,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuphemistich"/>
@@ -68,7 +68,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:sequence>
             <cd:instance value="hemistich"/>
         </cd:sequence>
@@ -78,7 +78,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hemistichescaesura" level="document" category="whitespace fonts" file="m-hemistich.mkiv">
+    <cd:command name="hemistichescaesura" level="document" category="whitespace" keywords="fonts" file="m-hemistich.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:keywords delimiters="braces">
diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml
index 35e954148..46b53e24c 100644
--- a/tex/context/interface/mkiv/i-highlight.xml
+++ b/tex/context/interface/mkiv/i-highlight.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definehighlight" level="style" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="definehighlight" level="style" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuphighlight" level="style" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="setuphighlight" level="style" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -32,7 +32,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:sequence>
             <cd:variable value="highlight"/>
         </cd:sequence>
@@ -41,20 +41,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="highlight" level="document" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="highlight" level="document" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="highlight" type="environment" level="document" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="highlight" type="environment" level="document" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directhighlight" level="document" category="fonts colors" file="core-sys.mkiv">
+    <cd:command name="directhighlight" level="document" category="fonts" keywords="colors" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml
index d807fbb57..878063106 100644
--- a/tex/context/interface/mkiv/i-hspace.xml
+++ b/tex/context/interface/mkiv/i-hspace.xml
@@ -111,11 +111,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/>
+    <cd:command name="leftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv"/>
 
-    <cd:command name="rightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/>
+    <cd:command name="rightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv"/>
 
-    <cd:command name="dosetleftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="dosetleftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-leftskip"/>
@@ -123,7 +123,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosetrightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="dosetrightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-rightskip"/>
@@ -131,7 +131,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doadaptleftskip" level="system" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="doadaptleftskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-leftskip"/>
@@ -139,7 +139,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doadaptrightskip" level="system" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="doadaptrightskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-rightskip"/>
diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml
index ed91b9193..cacae0673 100644
--- a/tex/context/interface/mkiv/i-indent.xml
+++ b/tex/context/interface/mkiv/i-indent.xml
@@ -88,4 +88,11 @@
 
     <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" category="whitespace" file="spac-hor.mkiv"/>
 
+    <cd:command name="doifelseindented" level="system" category="whitespace" keywords="conditional" file="supp-box.lua">
+        <cd:arguments>
+            <cd:resolve name="argument-true"/>
+            <cd:resolve name="argument-false"/>
+        </cd:argument>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml
index 8bb52616b..d3398614b 100644
--- a/tex/context/interface/mkiv/i-insertion.xml
+++ b/tex/context/interface/mkiv/i-insertion.xml
@@ -29,7 +29,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinsertion" level="system" category="structure conditional" file="page-ins.mkiv">
+    <cd:command name="doifelseinsertion" level="system" category="structure" keywords="conditional" file="page-ins.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -37,7 +37,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinsertionelse" level="system" category="structure conditional" file="page-ins.mkiv">
+    <cd:command name="doifinsertionelse" level="system" category="structure" keywords="conditional" file="page-ins.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml
index 36c0c3572..14151a4d4 100644
--- a/tex/context/interface/mkiv/i-interaction.xml
+++ b/tex/context/interface/mkiv/i-interaction.xml
@@ -143,14 +143,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselocation" level="system" category="pdf conditional" file="scrn-ini.mkvi">
+    <cd:command name="doifelselocation" level="system" category="pdf" keywords="conditional" file="scrn-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflocationelse" level="system" category="pdf conditional" file="scrn-ini.mkvi">
+    <cd:command name="doiflocationelse" level="system" category="pdf" keywords="conditional" file="scrn-ini.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml
index 08c273812..6434eb61d 100644
--- a/tex/context/interface/mkiv/i-interface.xml
+++ b/tex/context/interface/mkiv/i-interface.xml
@@ -4,13 +4,13 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defaultinterface" level="system" file="mult-ini.mkiv"/>
+    <cd:command name="defaultinterface" level="system" category="interface" file="mult-ini.mkiv"/>
 
-    <cd:command name="currentinterface" level="system" file="mult-ini.mkiv"/>
+    <cd:command name="currentinterface" level="system" category="interface" file="mult-ini.mkiv"/>
 
-    <cd:command name="currentresponses" level="system" file="mult-ini.mkiv"/>
+    <cd:command name="currentresponses" level="system" category="interface" file="mult-ini.mkiv"/>
 
-    <cd:command name="interface" type="environment" level="system" file="mult-ini.mkiv">
+    <cd:command name="interface" type="environment" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="none">
                 <cd:constant type="all"/>
@@ -19,53 +19,53 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineinterfaceconstant" level="system" file="mult-ini.mkiv">
+    <cd:command name="defineinterfaceconstant" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineinterfacevariable" level="system" file="mult-ini.mkiv">
+    <cd:command name="defineinterfacevariable" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineinterfaceelement" level="system" file="mult-ini.mkiv">
+    <cd:command name="defineinterfaceelement" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefileconstant" level="system" file="mult-ini.mkiv">
+    <cd:command name="definefileconstant" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definesystemconstant" level="system" file="mult-ini.mkiv">
+    <cd:command name="definesystemconstant" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definemessageconstant" level="system" file="mult-ini.mkiv">
+    <cd:command name="definemessageconstant" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definesystemvariable" level="system" file="mult-ini.mkiv">
+    <cd:command name="definesystemvariable" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setinterfacemessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="setinterfacemessage" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -77,7 +77,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setmessagetext" level="system" file="mult-ini.mkiv">
+    <cd:command name="setmessagetext" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -87,9 +87,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentmessagetext" level="system" file="mult-ini.mkiv"/>
+    <cd:command name="currentmessagetext" level="system" category="tracker" file="mult-ini.mkiv"/>
 
-    <cd:command name="getmessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="getmessage" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -99,7 +99,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="doifelsemessage" level="system" category="tracker" keywords="conditional" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -111,7 +111,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmessageelse" level="system" file="mult-ini.mkiv">
+    <cd:command name="doifmessageelse" level="system" category="tracker" keywords="conditional" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -123,7 +123,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showmessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="showmessage" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -134,32 +134,32 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="writestatus" level="system" file="mult-ini.mkiv">
+    <cd:command name="writestatus" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="message" level="system" file="mult-ini.mkiv">
+    <cd:command name="message" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inlinemessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="inlinemessage" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="displaymessage" level="system" file="mult-ini.mkiv">
+    <cd:command name="displaymessage" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showwarning" level="system" file="mult-ini.mkiv">
+    <cd:command name="showwarning" level="system" category="tracker" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -170,33 +170,32 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setinterfaceconstant" level="system" file="mult-ini.mkiv">
+    <cd:command name="setinterfaceconstant" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setinterfacevariable" level="system" file="mult-ini.mkiv">
+    <cd:command name="setinterfacevariable" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setinterfaceelement" level="system" file="mult-ini.mkiv">
+    <cd:command name="setinterfaceelement" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setinterfacecommand" level="system" file="mult-ini.mkiv">
+    <cd:command name="setinterfacecommand" level="system" category="interface" file="mult-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-ipsum.xml b/tex/context/interface/mkiv/i-ipsum.xml
index 3cb4a5350..83dc8f0d0 100644
--- a/tex/context/interface/mkiv/i-ipsum.xml
+++ b/tex/context/interface/mkiv/i-ipsum.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineipsum" level="style" file="m-ipsum.mkiv">
+    <cd:command name="defineipsum" level="style" category="language" file="m-ipsum.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupipsum" level="style" file="m-ipsum.mkiv">
+    <cd:command name="setupipsum" level="style" category="language" file="m-ipsum.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -63,7 +63,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ipsum" level="document" file="m-ipsum.mkiv">
+    <cd:command name="ipsum" level="document" category="language" file="m-ipsum.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -72,7 +72,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directipsum" level="document" file="m-ipsum.mkiv">
+    <cd:command name="directipsum" level="document" category="language" file="m-ipsum.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml
index fe183a723..6d687f381 100644
--- a/tex/context/interface/mkiv/i-itemgroup.xml
+++ b/tex/context/interface/mkiv/i-itemgroup.xml
@@ -398,7 +398,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroup" level="style" category="structure" keywords="counter" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -410,7 +410,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure" keywords="counter" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -420,7 +420,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroups" level="style" category="structure counter" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroups" level="style" category="structure" keywords="counter" file="strc-itm.mkvi">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -430,7 +430,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure counter" file="strc-itm.mkvi">
+    <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure" keywords="counter" file="strc-itm.mkvi">
         <cd:sequence>
             <cd:string value="setup"/>
             <cd:instance value="itemgroup"/>
diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml
index a467a11f5..af7ca0474 100644
--- a/tex/context/interface/mkiv/i-kerning.xml
+++ b/tex/context/interface/mkiv/i-kerning.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definecharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="definecharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="setupcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -38,7 +38,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="setcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="reset"/>
@@ -47,9 +47,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"/>
+    <cd:command name="resetcharacterkerning" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv"/>
 
-    <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:sequence>
             <cd:variable value="characterkerning"/>
         </cd:sequence>
@@ -59,21 +59,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="kerncharacters" level="document" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="kerncharacters" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number-optional"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letterspacing" level="document" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="letterspacing" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number-optional"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="stretched" level="document" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="stretched" level="document" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupstretched"/>
@@ -82,7 +82,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupstretched" level="style" category="fonts whitespace" file="typo-krn.mkiv">
+    <cd:command name="setupstretched" level="style" category="fonts" keywords="whitespace" file="typo-krn.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupcharacterkerning"/>
@@ -90,7 +90,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic">
+    <cd:command name="defineperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -100,7 +100,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic">
+    <cd:command name="setupperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -111,7 +111,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic">
+    <cd:command name="setperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="reset"/>
@@ -120,6 +120,6 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"/>
+    <cd:command name="resetperiodkerning" level="style" category="fonts" keywords="whitespace" file="typo-pnc.mkic"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml
index de8835a79..9bb92c722 100644
--- a/tex/context/interface/mkiv/i-language.xml
+++ b/tex/context/interface/mkiv/i-language.xml
@@ -134,7 +134,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselanguage" level="system" category="language conditional" file="lang-ini.mkiv">
+    <cd:command name="doifelselanguage" level="system" category="language" keywords="conditional" file="lang-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-language"/>
             <cd:resolve name="argument-true"/>
@@ -142,7 +142,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflanguageelse" level="system" category="language conditional" file="lang-ini.mkiv">
+    <cd:command name="doiflanguageelse" level="system" category="language" keywords="conditional" file="lang-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-language"/>
             <cd:resolve name="argument-true"/>
@@ -150,7 +150,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepatterns" level="system" category="language conditional" file="lang-ini.mkiv">
+    <cd:command name="doifelsepatterns" level="system" category="language" keywords="conditional" file="lang-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-language"/>
             <cd:resolve name="argument-true"/>
@@ -158,7 +158,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpatternselse" level="system" category="language conditional" file="lang-ini.mkiv">
+    <cd:command name="doifpatternselse" level="system" category="language" keywords="conditional" file="lang-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-language"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml
index a851b64bd..3b1af0d00 100644
--- a/tex/context/interface/mkiv/i-layer.xml
+++ b/tex/context/interface/mkiv/i-layer.xml
@@ -283,7 +283,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselayerdata" level="system" category="background conditional" file="pack-lyr.mkiv">
+    <cd:command name="doifelselayerdata" level="system" category="background" keywords="conditional" file="pack-lyr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -291,7 +291,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflayerdataelse" level="system" category="background conditional" file="pack-lyr.mkiv">
+    <cd:command name="doiflayerdataelse" level="system" category="background" keywords="conditional" file="pack-lyr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -303,7 +303,7 @@
 
     <cd:command name="layerheight" level="system" category="background" file="pack-lyr.mkiv"/>
 
-    <cd:command name="setMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv">
+    <cd:command name="setMPlayer" level="document" category="background" keywords="metapost" file="pack-lyr.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name"/>
@@ -314,7 +314,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv">
+    <cd:command name="getMPlayer" level="document" category="background" keywords="metapost" file="pack-lyr.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml
index 2f918bf0d..b4a830f98 100644
--- a/tex/context/interface/mkiv/i-layout.xml
+++ b/tex/context/interface/mkiv/i-layout.xml
@@ -225,7 +225,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselayoutdefined" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doifelselayoutdefined" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -233,7 +233,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflayoutdefinedelse" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doiflayoutdefinedelse" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -262,21 +262,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseoddpage" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doifelseoddpage" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoddpageelse" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doifoddpageelse" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifbothsidesoverruled" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doifbothsidesoverruled" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -284,7 +284,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifbothsides" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="doifbothsides" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -292,7 +292,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightorleftpageaction" level="system" category="layout conditional" file="page-lay.mkiv">
+    <cd:command name="rightorleftpageaction" level="system" category="layout" keywords="conditional" file="page-lay.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -373,14 +373,14 @@
 
     <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/>
 
-    <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-ini.mkiv">
+    <cd:command name="doifelsetopofpage" level="system" category="layout" keywords="conditional" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-ini.mkiv">
+    <cd:command name="doiftopofpageelse" level="system" category="layout" keywords="conditional" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-linefiller.xml b/tex/context/interface/mkiv/i-linefiller.xml
index ab53e64b0..aeb14046d 100644
--- a/tex/context/interface/mkiv/i-linefiller.xml
+++ b/tex/context/interface/mkiv/i-linefiller.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="definelinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setuplinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -72,7 +72,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setuplinefillers" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -81,7 +81,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="linefiller" type="environment" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="filler"/>
@@ -93,7 +93,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv">
+    <cd:command name="setlinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="filler"/>
@@ -102,4 +102,28 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="linefillerhbox" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="string-boxoptions"/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="linefillervbox" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="string-boxoptions"/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="linefillervtop" level="document" category="rules" keywords="metapost boxes" file="node-rul.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="string-boxoptions"/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml
index 4aa68c319..9a53a42cb 100644
--- a/tex/context/interface/mkiv/i-linenumber.xml
+++ b/tex/context/interface/mkiv/i-linenumber.xml
@@ -140,7 +140,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesamelinereference" level="system" category="structure conditional" file="page-lin.mkvi">
+    <cd:command name="doifelsesamelinereference" level="system" category="structure" keywords="conditional" file="page-lin.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-reference"/>
             <cd:resolve name="argument-true"/>
@@ -148,7 +148,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsamelinereferenceelse" level="system" category="structure conditional" file="page-lin.mkvi">
+    <cd:command name="doifsamelinereferenceelse" level="system" category="structure" keywords="conditional" file="page-lin.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-reference"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml
index dcaca281e..e2bc35605 100644
--- a/tex/context/interface/mkiv/i-lines.xml
+++ b/tex/context/interface/mkiv/i-lines.xml
@@ -4,33 +4,39 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="noflines" level="system" file="supp-box.mkiv"/>
+    <cd:command name="noflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv"/>
 
-    <cd:command name="getnoflines" level="system" file="supp-box.mkiv">
+    <cd:command name="getnoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getroundednoflines" level="system" file="supp-box.mkiv">
+    <cd:command name="getroundednoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawnoflines" level="system" file="supp-box.mkiv">
+    <cd:command name="getrawnoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="determinenoflines" level="system" file="supp-box.mkiv">
+    <cd:command name="determinenoflines" level="system" category="boxes" keywords="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definelines" level="style" file="spac-lin.mkiv">
+    <cd:command name="noflinesinbox" level="system" category="boxes" file="supp-box.lua">
+        <cd:arguments>
+            <cd:resolve name="string-box"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="definelines" level="style" category="structure" file="spac-lin.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -40,7 +46,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplines" level="style" file="spac-lin.mkiv">
+    <cd:command name="setuplines" level="style" category="structure" file="spac-lin.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -84,11 +90,15 @@
                 <cd:parameter name="right">
                     <cd:constant type="cd:command"/>
                 </cd:parameter>
+                <cd:parameter name="indentlist" list="yes">
+                    <cd:constant type="cd:dimension"/>
+                    <cd:constant type="*"/>
+                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" file="spac-lin.mkiv">
+    <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" category="structure" file="spac-lin.mkiv">
         <cd:sequence>
             <cd:instance value="lines"/>
         </cd:sequence>
@@ -104,7 +114,7 @@
 
     <!--
 
-        <cd:command name="lines" type="environment" level="document" file="spac-lin.mkiv">
+        <cd:command name="lines" type="environment" level="document" category="structure" file="spac-lin.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuplines"/>
@@ -114,7 +124,7 @@
 
     -->
 
-    <cd:command name="emptylines" level="document" file="spac-lin.mkiv">
+    <cd:command name="emptylines" level="document" category="whitespace" file="spac-lin.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number-optional"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-linetable.xml b/tex/context/interface/mkiv/i-linetable.xml
index 756b20d5d..ac622472b 100644
--- a/tex/context/interface/mkiv/i-linetable.xml
+++ b/tex/context/interface/mkiv/i-linetable.xml
@@ -112,7 +112,7 @@
 
     <cd:command name="linetablebody" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/>
 
-    <cd:command name="processlinetablebuffer" level="document" category="tables buffer" file="tabl-ltb.mkiv">
+    <cd:command name="processlinetablebuffer" level="document" category="tables" keywords="buffer" file="tabl-ltb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-buffer-optional"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml
index ac20aefff..08dfa0cde 100644
--- a/tex/context/interface/mkiv/i-list.xml
+++ b/tex/context/interface/mkiv/i-list.xml
@@ -310,7 +310,7 @@
 
     -->
 
-    <cd:command name="doifelselist" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doifelselist" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-list"/>
             <cd:resolve name="argument-true"/>
@@ -318,7 +318,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflistelse" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doiflistelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-list"/>
             <cd:resolve name="argument-true"/>
@@ -545,28 +545,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsestructurelisthaspage" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doifelsestructurelisthaspage" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifstructurelisthaspageelse" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doifstructurelisthaspageelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure conditional" file="strc-lst.mkvi">
+    <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure" keywords="conditional" file="strc-lst.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml
index fee025a9a..27b80ca01 100644
--- a/tex/context/interface/mkiv/i-makeup.xml
+++ b/tex/context/interface/mkiv/i-makeup.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemakeup" level="style" category="structure layout" file="page-mak.mkvi">
+    <cd:command name="definemakeup" level="style" category="structure" keywords="layout" file="page-mak.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmakeup" level="style" category="structure layout" file="page-mak.mkvi">
+    <cd:command name="setupmakeup" level="style" category="structure" keywords="layout" file="page-mak.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -113,7 +113,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="makeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi">
+    <cd:command name="makeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -122,7 +122,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mak.mkvi">
+    <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
         <cd:sequence>
             <cd:instance value="makeup"/>
             <cd:string value="makeup"/>
@@ -139,7 +139,7 @@
 
     <!--
 
-        <cd:command name="standardmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi">
+        <cd:command name="standardmakeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmakeup"/>
@@ -147,7 +147,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="textmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi">
+        <cd:command name="textmakeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmakeup"/>
@@ -155,7 +155,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="pagemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi">
+        <cd:command name="pagemakeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmakeup"/>
@@ -163,7 +163,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="middlemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi">
+        <cd:command name="middlemakeup" type="environment" level="document" category="structure" keywords="layout" file="page-mak.mkvi">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmakeup"/>
diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml
index fffa32113..0443a234e 100644
--- a/tex/context/interface/mkiv/i-marginblock.xml
+++ b/tex/context/interface/mkiv/i-marginblock.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemarginblock" level="style" category="structure layout" file="page-mbk.mkvi">
+    <cd:command name="definemarginblock" level="style" category="structure" keywords="layout" file="page-mbk.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmarginblock" level="style" category="structure layout" file="page-mbk.mkvi">
+    <cd:command name="setupmarginblock" level="style" category="structure" keywords="layout" file="page-mbk.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -67,7 +67,7 @@
 
     <!--
 
-        <cd:command name="setupmarginblocks" level="style" category="structure layout" file="page-mbk.mkvi">
+        <cd:command name="setupmarginblocks" level="style" category="structure" keywords="layout" file="page-mbk.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -78,7 +78,7 @@
 
     -->
 
-    <cd:command name="marginblock" type="environment" level="document" category="structure layout" file="page-mbk.mkvi">
+    <cd:command name="marginblock" type="environment" level="document" category="structure" keywords="layout" file="page-mbk.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml
index bd0d9b45b..84273ee3b 100644
--- a/tex/context/interface/mkiv/i-marking.xml
+++ b/tex/context/interface/mkiv/i-marking.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="definemarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-mark-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="setupmarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark-list-optional"/>
             <cd:assignments list="yes">
@@ -36,27 +36,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="relatemarking" level="system" file="strc-mar.mkiv">
+    <cd:command name="relatemarking" level="system" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:resolve name="keyword-mark"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setmarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="setmarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetmarking" level="system" file="strc-mar.mkiv">
+    <cd:command name="resetmarking" level="system" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="synchronizemarking" level="system" file="strc-mar.mkiv">
+    <cd:command name="synchronizemarking" level="system" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:resolve name="keyword-number"/>
@@ -66,7 +66,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemarking" level="system" category="conditional" file="strc-mar.mkiv">
+    <cd:command name="doifelsemarking" level="system" category="structure" keywords="conditional" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-mark"/>
             <cd:resolve name="argument-true"/>
@@ -74,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmarkingelse" level="system" category="conditional" file="strc-mar.mkiv">
+    <cd:command name="doifmarkingelse" level="system" category="structure" keywords="conditional" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-mark"/>
             <cd:resolve name="argument-true"/>
@@ -82,7 +82,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getmarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="getmarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords optional="yes">
@@ -96,7 +96,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchonemark" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchonemark" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords optional="yes">
@@ -105,19 +105,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchtwomarks" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchtwomarks" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchallmarks" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchallmarks" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchmark" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchmark" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords optional="yes">
@@ -126,7 +126,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchmarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchmarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords>
@@ -140,7 +140,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchonemarking" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchonemarking" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords>
@@ -154,7 +154,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchtwomarkings" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchtwomarkings" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords>
@@ -165,7 +165,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fetchallmarkings" level="style" file="strc-mar.mkiv">
+    <cd:command name="fetchallmarkings" level="style" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-mark"/>
             <cd:keywords>
diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml
index be1c86c5d..1a1c139a3 100644
--- a/tex/context/interface/mkiv/i-mathalignment.xml
+++ b/tex/context/interface/mkiv/i-mathalignment.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="definemathalignment" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="setupmathalignment" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -53,7 +53,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:sequence>
             <cd:instance value="mathalignment"/>
         </cd:sequence>
@@ -69,7 +69,7 @@
 
     <!--
 
-        <cd:command name="mathalignment" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv">
+        <cd:command name="mathalignment" type="environment" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathalignment"/>
@@ -77,7 +77,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="align" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv">
+        <cd:command name="align" type="environment" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathalignment"/>
diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml
index 76af5a4f8..7066134cf 100644
--- a/tex/context/interface/mkiv/i-mathcases.xml
+++ b/tex/context/interface/mkiv/i-mathcases.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemathcases" level="style" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="definemathcases" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmathcases" level="style" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="setupmathcases" level="style" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -41,7 +41,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv">
+    <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
         <cd:sequence>
             <cd:instance value="mathcases"/>
         </cd:sequence>
@@ -57,7 +57,7 @@
 
     <!--
 
-        <cd:command name="mathcases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv">
+        <cd:command name="mathcases" type="environment" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathcases"/>
@@ -65,7 +65,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="cases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv">
+        <cd:command name="cases" type="environment" level="document" category="mathematics" keywords="alignment" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathcases"/>
diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml
index 581a6928a..f7bf61e93 100644
--- a/tex/context/interface/mkiv/i-mathmatrix.xml
+++ b/tex/context/interface/mkiv/i-mathmatrix.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv">
+    <cd:command name="definemathmatrix" level="style" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv">
+    <cd:command name="setupmathmatrix" level="style" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -56,7 +56,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics tables" file="math-ali.mkiv">
+    <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:sequence>
             <cd:instance value="mathmatrix"/>
         </cd:sequence>
@@ -72,7 +72,7 @@
 
     <!--
 
-        <cd:command name="mathmatrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv">
+        <cd:command name="mathmatrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathmatrix"/>
@@ -80,7 +80,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="matrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv">
+        <cd:command name="matrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmathmatrix"/>
@@ -90,7 +90,7 @@
 
     -->
 
-    <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics tables" file="math-ali.mkiv">
+    <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:sequence>
             <cd:variable value="mathmatrix"/>
         </cd:sequence>
@@ -99,7 +99,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv">
+    <cd:command name="matrices" type="environment" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupmathmatrix"/>
@@ -131,20 +131,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv">
+    <cd:command name="bordermatrix" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bbordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv">
+    <cd:command name="bbordermatrix" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/>
+    <cd:command name="bordermatrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"/>
 
-    <cd:command name="bbordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/>
+    <cd:command name="bbordermatrix" type="environment" level="document" category="mathematics" keywords="tables" file="math-pln.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-mathname.xml b/tex/context/interface/mkiv/i-mathname.xml
index 29b8ad32f..161dcf00c 100644
--- a/tex/context/interface/mkiv/i-mathname.xml
+++ b/tex/context/interface/mkiv/i-mathname.xml
@@ -4,1088 +4,1088 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="mathhash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mathhash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mathdollar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mathdollar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mathpercent" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mathpercent" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mathampersand" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mathampersand" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lparent" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rparent" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ast" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mathhyphen" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mathhyphen" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="colon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lt" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lt" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gt" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gt" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="backslash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="backslash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Hat" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Hat" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="grave" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="grave" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lbrace" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rbrace" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="yen" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="yen" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="S" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="S" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ddot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ddot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="pm" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="pm" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="acute" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="acute" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="P" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="P" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="centerdot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="centerdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="times" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="times" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eth" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eth" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="div" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="div" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lambdabar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lambdabar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="hat" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="hat" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="check" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="check" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="breve" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="breve" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ring" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ring" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="tilde" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="tilde" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="widehat" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="widehat" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="widetilde" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="widetilde" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="not" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="not" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Alpha" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Alpha" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Beta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Beta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Gamma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Gamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Delta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Delta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Epsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Epsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Zeta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Zeta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Eta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Eta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Theta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Theta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Iota" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Iota" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Kappa" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Kappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Lambda" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Lambda" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Mu" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Mu" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Nu" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Nu" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Xi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Xi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Omicron" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Omicron" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Pi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Pi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Rho" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Rho" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Sigma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Sigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Tau" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Tau" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Upsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Upsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Phi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Phi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Chi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Chi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Psi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Psi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Omega" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Omega" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="alpha" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="alpha" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="beta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="beta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gamma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="delta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="delta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varepsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varepsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="zeta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="zeta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="theta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="theta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="iota" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="iota" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="kappa" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="kappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lambda" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lambda" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mu" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mu" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nu" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nu" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="xi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="xi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="omicron" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="omicron" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="pi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="pi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rho" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rho" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varsigma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varsigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sigma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sigma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="tau" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="tau" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="upsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="upsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varphi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varphi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="chi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="chi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="psi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="psi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="omega" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="omega" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varTheta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varTheta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="phi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="phi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varpi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varpi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="digamma" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="digamma" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varkappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="epsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="epsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="backepsilon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="backepsilon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bullet" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bullet" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="prime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="prime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="doubleprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="doubleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="tripleprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="tripleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="reversedprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="reversedprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="reverseddoubleprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="reverseddoubleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="reversedtripleprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="reversedtripleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="quadrupleprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="quadrupleprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="invisibletimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="invisibletimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="positivesign" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="positivesign" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="negativesign" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="negativesign" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="vec" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="vec" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dddot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dddot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigsquare" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigsquare" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigdiamond" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigdiamond" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="actuarial" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="actuarial" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="complexes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="complexes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Eulerconst" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Eulerconst" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Plankconst" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Plankconst" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Im" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Im" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ell" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ell" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="naturalnumbers" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="naturalnumbers" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="wp" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="wp" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="primes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="primes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rationals" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rationals" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Re" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Re" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="reals" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="reals" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="integers" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="integers" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ohm" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ohm" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mho" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mho" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="turnediota" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="turnediota" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Angstrom" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Angstrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Finv" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Finv" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="aleph" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="aleph" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="beth" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="beth" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gimel" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gimel" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="daleth" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="daleth" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Game" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Game" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sansLturned" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sansLturned" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sansLmirrored" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sansLmirrored" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Yup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Yup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="differentialD" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="differentialD" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="differentiald" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="differentiald" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="exponentiale" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="exponentiale" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="imaginaryi" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="imaginaryi" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="imaginaryj" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="imaginaryj" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="PropertyLine" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="PropertyLine" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="upand" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="upand" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="uparrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="uparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="updownarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="updownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nwarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="searrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="searrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="swarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="swarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftwavearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftwavearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightwavearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightwavearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="twoheadleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="twoheadleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="twoheaduparrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="twoheaduparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="twoheadrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="twoheadrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="twoheaddownarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="twoheaddownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftarrowtail" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightarrowtail" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mapsfrom" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mapsup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mapsup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mapsto" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mapsdown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mapsdown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="updownarrowbar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="updownarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="hookleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="hookleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="hookrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="hookrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="looparrowleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="looparrowleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="looparrowright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="looparrowright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftrightsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downzigzagarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downzigzagarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Lsh" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Lsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Rsh" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Rsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Ldsh" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Ldsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Rdsh" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Rdsh" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="linefeed" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="linefeed" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="carriagereturn" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="carriagereturn" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curvearrowleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curvearrowleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curvearrowright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curvearrowright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="barovernorthwestarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="barovernorthwestarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="barleftarrowrightarrowbar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="barleftarrowrightarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftharpoonup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftharpoonup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftharpoondown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftharpoondown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="upharpoonleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="upharpoonleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightharpoonup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightharpoonup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightharpoondown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightharpoondown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downharpoonright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downharpoonright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downharpoonleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downharpoonleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightleftarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightleftarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="updownarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="updownarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftrightarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftrightarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftleftarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftleftarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="upuparrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="upuparrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightrightarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightrightarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downdownarrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downdownarrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftrightharpoons" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftrightharpoons" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightleftharpoons" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightleftharpoons" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nLeftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nLeftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nLeftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nLeftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nRightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nRightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Leftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Leftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Uparrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Uparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Downarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Downarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Leftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Updownarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Updownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Nwarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Nwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Nearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Nearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Searrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Searrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Swarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Swarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Lleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Lleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Rrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Rrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftsquigarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nHuparrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nHuparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nHdownarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nHdownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftdasharrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftdasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="updasharrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="updasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downdasharrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downdasharrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="barleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="barleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightarrowbar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightarrowbar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftwhitearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="upwhitearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="upwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightwhitearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downwhitearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downwhitearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="whitearrowupfrombar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="whitearrowupfrombar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circleonrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circleonrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="downuparrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="downuparrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightthreearrows" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightthreearrows" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nvleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nvleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nvrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nvrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nvleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nvleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nVleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nVleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nVrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nVrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nVleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nVleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftrightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftrightarrowtriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="forall" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="forall" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="complement" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="complement" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="partial" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="partial" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="exists" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="exists" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nexists" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nexists" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="emptyset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="emptyset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nabla" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nabla" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="in" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="in" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="prod" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="prod" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="coprod" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="coprod" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sum" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sum" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="mp" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="mp" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dotplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dotplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="diagup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="diagup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="diagdown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="diagdown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ast" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circ" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circ" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="propto" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="propto" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="infty" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="infty" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="angle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="angle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="measuredangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="measuredangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sphericalangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sphericalangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="divides" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="divides" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nparallel" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nparallel" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="cap" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="cap" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="cup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="cup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="oint" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="oint" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="oiint" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="oiint" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="oiiint" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="oiiint" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="intclockwise" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="intclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ointclockwise" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ointclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ointctrclockwise" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ointctrclockwise" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="therefore" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="therefore" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="because" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="because" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="colon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="squaredots" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="squaredots" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dotminus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dotminus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="minuscolon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="minuscolon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="backsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="backsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="wr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="wr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="simeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="simeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsimeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsimeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="approxnEq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="approxnEq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="approx" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="approx" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="napprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="napprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="approxeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="approxeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="asymp" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="asymp" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Bumpeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Bumpeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="doteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="doteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="fallingdotseq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="fallingdotseq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="risingdotseq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="risingdotseq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="colonequals" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="colonequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="equalscolon" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="equalscolon" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqcirc" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="wedgeeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="wedgeeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="veeeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="veeeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="stareq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="stareq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="triangleq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="triangleq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="definedeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="definedeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="measuredeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="measuredeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="questionedeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="questionedeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="equiv" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="equiv" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nequiv" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nequiv" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="geqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="geqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ll" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ll" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gg" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gg" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="between" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="between" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nasymp" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nasymp" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ngtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ngtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nleq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nleq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ngeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ngeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lesssim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lesssim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtrsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtrsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nlesssim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nlesssim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ngtrsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ngtrsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lessgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lessgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtrless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtrless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nlessgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nlessgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ngtrless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ngtrless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="prec" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="prec" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succ" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succ" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="preccurlyeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="preccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succcurlyeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succcurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nprec" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nprec" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsucc" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsucc" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="subset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="subset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="supset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="supset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsubset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsubset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsupset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsupset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="subseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="subseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="supseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="supseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsubseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsupseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="subsetneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="subsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="supsetneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="supsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="uplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="uplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsubset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsubset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsupset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsupset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsubseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsupseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqcap" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqcup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="oplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="oplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ominus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ominus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="otimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="otimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="oslash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="oslash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="odot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="odot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circledcirc" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circledcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circledast" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circledast" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circledequals" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circledequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circleddash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circleddash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="boxplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="boxplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="boxminus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="boxminus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="boxtimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="boxtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="boxdot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="boxdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="vdash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="vdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dashv" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dashv" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="top" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="top" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="models" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="models" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="vDash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="vDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Vdash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Vdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Vvdash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Vvdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="VDash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="VDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nvdash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nvdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nvDash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nvDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nVdash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nVdash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nVDash" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nVDash" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="multimap" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="multimap" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="intercal" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="intercal" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="veebar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="veebar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="barwedge" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="barwedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigwedge" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigwedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigvee" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigvee" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigcap" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigcup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="diamond" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="diamond" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="star" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="star" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="divideontimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="divideontimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ltimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ltimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rtimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leftthreetimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leftthreetimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rightthreetimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rightthreetimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curlyvee" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curlyvee" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curlywedge" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curlywedge" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Subset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Subset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Supset" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Supset" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="pitchfork" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="pitchfork" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lessdot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lessdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtrdot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtrdot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lesseqgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lesseqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtreqless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtreqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curlyeqprec" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curlyeqprec" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="curlyeqsucc" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="curlyeqsucc" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="npreccurlyeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="npreccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsucccurlyeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsucccurlyeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsqsubseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsqsubseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nsqsupseteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nsqsupseteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsubsetneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsubsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sqsupsetneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sqsupsetneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lnsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gnsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precnsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succnsim" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succnsim" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ntriangleright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ntriangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ntriangleleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ntriangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ntrianglelefteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ntrianglelefteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ntrianglerighteq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ntrianglerighteq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="vdots" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="vdots" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="cdots" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="cdots" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="udots" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="udots" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ddots" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ddots" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lceil" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lceil" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rceil" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rceil" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lfloor" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lfloor" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rfloor" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rfloor" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="ulcorner" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="ulcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="urcorner" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="urcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="llcorner" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="llcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lrcorner" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lrcorner" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="frown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="frown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="smile" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="smile" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lmoustache" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lmoustache" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rmoustache" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rmoustache" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="overbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="overbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="underbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="underbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="overparent" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="overparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="underparent" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="underparent" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="overbrace" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="overbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="underbrace" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="underbrace" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circledR" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circledR" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="circledS" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="circledS" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacksquare" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacksquare" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacktriangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacktriangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacktriangleright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacktriangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="triangleright" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="triangleright" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacktriangledown" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacktriangledown" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacktriangleleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacktriangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="triangleleft" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="triangleleft" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lozenge" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lozenge" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigcirc" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigcirc" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigstar" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigstar" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="spadesuit" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="spadesuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="heartsuit" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="heartsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="diamondsuit" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="diamondsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="clubsuit" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="clubsuit" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="blacklozenge" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="blacklozenge" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="flat" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="flat" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="natural" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="natural" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="sharp" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="sharp" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="checkmark" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="checkmark" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="maltese" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="maltese" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="llbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="llbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rrbracket" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rrbracket" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="langle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="langle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="llangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="llangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rrangle" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rrangle" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lgroup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lgroup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rgroup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rgroup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Longleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Longleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Longrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Longrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Longleftrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longmapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longmapsto" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longmapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Longmapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Longmapsto" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Longmapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="longrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="longrightsquigarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Mapsfrom" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Mapsfrom" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Mapsto" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Mapsto" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Uuparrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Uuparrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="Ddownarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="Ddownarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dashedleftarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dashedleftarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dashedrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dashedrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="dottedrightarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="dottedrightarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="twoheadrightarrowtail" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="twoheadrightarrowtail" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="nwsearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="nwsearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="neswarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="neswarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lhooknwarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lhooknwarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rhooknearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rhooknearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lhooksearrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lhooksearrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rhookswarrow" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rhookswarrow" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigodot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigodot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigoplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigoplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigotimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigotimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigudot" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigudot" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="biguplus" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="biguplus" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigsqcap" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigsqcap" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigsqcup" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigsqcup" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="bigtimes" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="bigtimes" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="amalg" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="amalg" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="coloncolonequals" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="coloncolonequals" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqeqeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqeqeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="leqslant" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="leqslant" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="geqslant" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="geqslant" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lessapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lessapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtrapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtrapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="rneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="rneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lnapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gnapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="lesseqqgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="lesseqqgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="gtreqqless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="gtreqqless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqslantless" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqslantless" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="eqslantgtr" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="eqslantgtr" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="preceq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="preceq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succeq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succeq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succneq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succneq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="preceqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="preceqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succeqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succeqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="precnapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="precnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="succnapprox" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="succnapprox" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="subseteqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="subseteqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="supseteqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="supseteqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="subsetneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="subsetneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="supsetneqq" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="supsetneqq" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="backprime" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="backprime" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="imath" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="imath" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="jmath" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="jmath" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="vartheta" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="vartheta" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varkappa" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
-    <cd:command name="varrho" level="document" category="character mathematics" file="char-def.lua"/>
+    <cd:command name="varrho" level="document" category="mathematics" keywords="character" file="char-def.lua"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml
index e2cc0d443..f79fe9f2f 100644
--- a/tex/context/interface/mkiv/i-metapost.xml
+++ b/tex/context/interface/mkiv/i-metapost.xml
@@ -4,21 +4,21 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="MPdefinitions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPdefinitions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-instance-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPextensions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPextensions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-instance-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPinitializations" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"/>
+    <cd:command name="MPinitializations" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"/>
 
-    <cd:command name="MPinclusions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPinclusions" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="+"/>
@@ -27,7 +27,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPinclusions" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPinclusions" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="+"/>
@@ -37,7 +37,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="defineMPinstance" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -47,7 +47,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="setupMPinstance" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -84,19 +84,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetMPinstance" level="system" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="resetMPinstance" level="system" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processMPfigurefile" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="processMPfigurefile" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPdrawing" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPdrawing" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="-"/>
@@ -104,85 +104,85 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/>
+    <cd:command name="resetMPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"/>
 
-    <cd:command name="getMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/>
+    <cd:command name="getMPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv"/>
 
-    <cd:command name="MPdrawing" level="system" type="environment" begin="push" end="pop" category="graphics metapost" file="meta-ini.mkiv"/>
+    <cd:command name="MPdrawing" level="system" type="environment" begin="push" end="pop" category="graphics" keywords="metapost" file="meta-ini.mkiv"/>
 
-    <cd:command name="MPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPdrawing" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPclip" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPclip" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPfontsizehskip" level="system" category="graphics metapost fonts" file="meta-ini.mkiv">
+    <cd:command name="MPfontsizehskip" level="system" category="graphics" keywords="metapost fonts" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-font"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupMPvariables" level="style" file="meta-ini.mkiv">
+    <cd:command name="setupMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setMPvariables" level="style" file="meta-ini.mkiv">
+    <cd:command name="setMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setMPvariable" level="style" file="meta-ini.mkiv">
+    <cd:command name="setMPvariable" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPrawvar" level="system" file="meta-ini.mkiv">
+    <cd:command name="MPrawvar" level="system" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPvariable" level="style" file="meta-ini.mkiv">
+    <cd:command name="MPvariable" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPvar" level="style" file="meta-ini.mkiv">
+    <cd:command name="MPvar" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useMPvariables" level="style" file="meta-ini.mkiv">
+    <cd:command name="useMPvariables" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-key-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uniqueMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="uniqueMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -193,14 +193,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="useMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="useMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -211,14 +211,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reuseMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="reuseMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -229,14 +229,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="reusableMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="reusableMPgraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -247,14 +247,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uniqueMPpagegraphic" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="uniqueMPpagegraphic" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -265,19 +265,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="processMPbuffer" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="runMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="runMPbuffer" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPenvironment" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPenvironment" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="reset"/>
@@ -287,72 +287,72 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetMPenvironment" level="style" category="graphics" file="meta-ini.mkiv"/>
+    <cd:command name="resetMPenvironment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv"/>
 
-    <cd:command name="useMPenvironmentbuffer" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="useMPenvironmentbuffer" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPcode" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPcode" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-instance-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPcode" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPcode" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-instance-optional"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPrun" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPrun" type="environment" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useMPrun" level="document" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="useMPrun" level="document" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useMPlibrary" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="useMPlibrary" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setMPtext" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="setMPtext" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPtext" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPtext" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPstring" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPstring" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPbetex" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="MPbetex" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseMPgraphic" level="style" category="graphics metapost conditional" file="meta-ini.mkiv">
+    <cd:command name="doifelseMPgraphic" level="style" category="graphics" keywords="metapost conditional" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -360,7 +360,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifMPgraphicelse" level="style" category="graphics metapost conditional" file="meta-ini.mkiv">
+    <cd:command name="doifMPgraphicelse" level="style" category="graphics" keywords="metapost conditional" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -368,20 +368,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="staticMPfigure" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="staticMPfigure" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usestaticMPfigure" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="usestaticMPfigure" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupscale"/>
@@ -390,7 +390,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupMPgraphics" level="style" category="graphics metapost" file="meta-ini.mkiv">
+    <cd:command name="setupMPgraphics" level="style" category="graphics" keywords="metapost" file="meta-ini.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="color">
diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml
index 701375237..5f727de42 100644
--- a/tex/context/interface/mkiv/i-mixedcolumns.xml
+++ b/tex/context/interface/mkiv/i-mixedcolumns.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definemixedcolumns" level="style" category="structure layout" file="page-mix.mkiv">
+    <cd:command name="definemixedcolumns" level="style" category="columns" keywords="structure layout" file="page-mix.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmixedcolumns" level="style" category="structure layout" file="page-mix.mkiv">
+    <cd:command name="setupmixedcolumns" level="style" category="columns" keywords="structure layout" file="page-mix.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -96,7 +96,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mixedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv">
+    <cd:command name="mixedcolumns" type="environment" level="document" category="columns" keywords="structure layout" file="page-mix.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -105,7 +105,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mix.mkiv">
+    <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="columns" keywords="structure layout" file="page-mix.mkiv">
         <cd:sequence>
             <cd:instance value="mixedcolumns"/>
         </cd:sequence>
@@ -121,7 +121,7 @@
 
     <!--
 
-        <cd:command name="boxedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv">
+        <cd:command name="boxedcolumns" type="environment" level="document" category="columns" keywords="structure layout" file="page-mix.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setupmixedcolumns"/>
@@ -131,7 +131,7 @@
 
     -->
 
-    <cd:command name="setupcolumns" level="style" category="structure layout" file="page-smp.mkiv">
+    <cd:command name="setupcolumns" level="style" category="columns" keywords="structure layout" file="page-smp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupmixedcolumns"/>
diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml
index beee0b392..4b9c5afaa 100644
--- a/tex/context/interface/mkiv/i-modes.xml
+++ b/tex/context/interface/mkiv/i-modes.xml
@@ -93,7 +93,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemode" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifelsemode" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -101,7 +101,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmodeelse" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifmodeelse" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -109,14 +109,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmode" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifmode" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotmode" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifnotmode" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -135,7 +135,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseallmodes" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifelseallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -143,7 +143,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallmodeselse" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifallmodeselse" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -151,7 +151,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallmodes" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -159,7 +159,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotallmodes" level="style" category="structure conditional" file="core-env.mkiv">
+    <cd:command name="doifnotallmodes" level="style" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml
index d3c846a16..8e12f4160 100644
--- a/tex/context/interface/mkiv/i-modules.xml
+++ b/tex/context/interface/mkiv/i-modules.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="usemodule" level="style" file="file-mod.mkvi">
+    <cd:command name="usemodule" level="style" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="m"/>
@@ -24,7 +24,7 @@
 
     <!--
 
-        <cd:command name="usemodules" level="style" file="file-mod.mkvi">
+        <cd:command name="usemodules" level="style" category="structure" file="file-mod.mkvi">
             <cd:arguments>
                 <cd:keywords optional="yes">
                     <cd:constant type="m"/>
@@ -44,7 +44,7 @@
 
     -->
 
-    <cd:command name="usetexmodule" level="style" file="file-mod.mkvi">
+    <cd:command name="usetexmodule" level="style" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="m"/>
@@ -62,19 +62,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="module" type="environment" level="system" file="file-mod.mkvi">
+    <cd:command name="module" type="environment" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="module" type="environment" variant="string" level="system" file="file-mod.mkvi">
+    <cd:command name="module" type="environment" variant="string" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="string-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupmodule" level="system" file="file-mod.mkvi">
+    <cd:command name="setupmodule" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file-optional"/>
             <cd:assignments list="yes">
@@ -89,35 +89,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="moduleparameter" level="system" file="file-mod.mkvi">
+    <cd:command name="moduleparameter" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentmoduleparameter" level="system" file="file-mod.mkvi">
+    <cd:command name="currentmoduleparameter" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="moduletestsection" type="environment" level="system" file="file-mod.mkvi"/>
+    <cd:command name="moduletestsection" type="environment" level="system" category="structure" file="file-mod.mkvi"/>
 
-    <cd:command name="fetchruntinecommand" level="system" file="file-mod.mkvi">
+    <cd:command name="fetchruntinecommand" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luaenvironment" level="system" file="file-mod.mkvi">
+    <cd:command name="luaenvironment" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="string-file"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useluamodule" level="system" file="file-mod.mkvi">
+    <cd:command name="useluamodule" level="system" category="structure" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml
index a229a2112..53584ce7c 100644
--- a/tex/context/interface/mkiv/i-narrow.xml
+++ b/tex/context/interface/mkiv/i-narrow.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definenarrower" level="style" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="definenarrower" level="style" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnarrower" level="style" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="setupnarrower" level="style" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -46,7 +46,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="narrower" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="narrower" type="environment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="left" prefix="cd:sign" method="none"/>
@@ -61,7 +61,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:sequence>
             <cd:variable value="narrower"/>
         </cd:sequence>
@@ -79,7 +79,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="narrow" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="narrow" type="environment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:keywords list="yes" optional="yes">
@@ -104,7 +104,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace layout" file="spac-hor.mkiv">
+    <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace" keywords="layout" file="spac-hor.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnarrower"/>
diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml
index 9aca6a848..db7918c68 100644
--- a/tex/context/interface/mkiv/i-naturaltable.xml
+++ b/tex/context/interface/mkiv/i-naturaltable.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="setupTABLE" level="style" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="r"/>
@@ -123,7 +123,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -131,7 +131,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEnested" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEnested" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -139,7 +139,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:parameter name="nx">
@@ -168,7 +168,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -176,7 +176,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="bTD"/>
@@ -184,7 +184,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="bTD"/>
@@ -192,7 +192,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -200,7 +200,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="bTD"/>
@@ -208,7 +208,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="bTD"/>
@@ -216,7 +216,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -224,7 +224,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -232,7 +232,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -240,7 +240,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -248,7 +248,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="defineTABLEsetup" level="style" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -257,19 +257,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLE" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -277,7 +277,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEhead" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -285,7 +285,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEnext" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -293,7 +293,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEbody" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
@@ -301,7 +301,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkxl">
+    <cd:command name="TABLEfoot" type="environment" level="document" category="tables" keywords="background rules" file="tabl-ntb.mkxl">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupTABLE"/>
diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml
index 44604fd22..12a6706fa 100644
--- a/tex/context/interface/mkiv/i-note.xml
+++ b/tex/context/interface/mkiv/i-note.xml
@@ -6,7 +6,7 @@
 
     <!--
 
-        <cd:command name="definenotation" level="system" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="definenotation" level="system" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -18,7 +18,7 @@
 
     -->
 
-    <cd:command name="setupnotation" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setupnotation" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -193,7 +193,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotations" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setupnotations" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -202,7 +202,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -214,7 +214,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -226,7 +226,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -239,7 +239,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:sequence>
             <cd:instance value="note"/>
         </cd:sequence>
@@ -251,7 +251,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="definenote" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="definenote" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -261,7 +261,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnote" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setupnote" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -404,7 +404,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupnotes" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setupnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -413,7 +413,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupfootnotes" level="style" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setupfootnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupnote"/>
@@ -421,7 +421,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setnote" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -429,14 +429,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setnote" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnotetext" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setnotetext" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -444,14 +444,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="setnotetext" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placenotes" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="placenotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
             <cd:assignments list="yes" optional="yes">
@@ -460,13 +460,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="localnotes" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placelocalnotes" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="placelocalnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -475,13 +475,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="postponenotes" level="style" category="structure notes" file="strc-not.mkvi"/>
+    <cd:command name="postponenotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/>
+    <cd:command name="flushnotes" level="style" category="structure" keywords="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="postponingnotes" type="environment" category="structure notes" file="strc-not.mkvi"/>
+    <cd:command name="postponingnotes" type="environment" category="structure" keywords="notes" file="strc-not.mkvi" file="strc-not.mkvi"/>
 
-    <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi">
+    <cd:command name="doifelsenoteonsamepage" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -489,7 +489,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnoteonsamepageelse" level="system" category="structure notes conditional" file="strc-not.mkvi">
+    <cd:command name="doifnoteonsamepageelse" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -497,21 +497,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotescollected" level="system" category="structure notes conditional" file="strc-not.mkvi">
+    <cd:command name="doifnotescollected" level="system" category="structure" keywords="notes conditional" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="notesymbol" level="system" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="notesymbol" level="system" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-reference-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="note" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="note" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="keyword-reference"/>
@@ -520,26 +520,26 @@
 
     <!--
 
-        <cd:command name="footnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="footnote" type="environment" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="footnote" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="footnote" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="footnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="footnote" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list"/>
             </cd:arguments>
@@ -547,20 +547,20 @@
 
     -->
 
-    <cd:command name="footnotetext" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="footnotetext" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference-list-optional"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="footnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="footnotetext" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:resolve name="assignment-constructiondata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefootnotes" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="placefootnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -568,9 +568,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localfootnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"/>
+    <cd:command name="localfootnotes" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi"/>
 
-    <cd:command name="placelocalfootnotes" level="document" category="structure notes" file="strc-not.mkvi">
+    <cd:command name="placelocalfootnotes" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupnote"/>
@@ -580,26 +580,26 @@
 
     <!--
 
-        <cd:command name="endnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="endnote" type="environment" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="endnote" type="environment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="endnote" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference-list-optional"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="endnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi">
+        <cd:command name="endnote" variant="assignment" level="document" category="structure" keywords="notes" file="strc-not.mkvi">
             <cd:arguments>
                 <cd:resolve name="assignment-constructiondata-list"/>
             </cd:arguments>
@@ -607,7 +607,7 @@
 
     -->
 
-    <cd:command name="definelinenote" level="style" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="definelinenote" level="style" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -617,7 +617,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuplinenote" level="style" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="setuplinenote" level="style" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -644,7 +644,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:instance value="linenote"/>
         </cd:sequence>
@@ -656,7 +656,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="start"/>
             <cd:instance value="linenote"/>
@@ -670,7 +670,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:sequence>
             <cd:string value="stop"/>
             <cd:instance value="linenote"/>
@@ -683,14 +683,14 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="fromlinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="fromlinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tolinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
+    <cd:command name="tolinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-reference"/>
         </cd:arguments>
@@ -698,20 +698,20 @@
 
     <!--
 
-        <cd:command name="linenote" level="document" category="structure notes" file="strc-lnt.mkvi">
+        <cd:command name="linenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="startlinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
+        <cd:command name="startlinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
                 <cd:resolve name="argument-text"/>
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="stoplinenote" level="document" category="structure notes" file="strc-lnt.mkvi">
+        <cd:command name="stoplinenote" level="document" category="structure" keywords="notes" file="strc-lnt.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-reference"/>
             </cd:arguments>
@@ -719,7 +719,7 @@
 
     -->
 
-    <cd:command name="definetextnote" level="style" category="structure notes" file="strc-tnt.mkiv">
+    <cd:command name="definetextnote" level="style" category="structure" keywords="notes" file="strc-tnt.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -729,7 +729,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuptextnote" level="style" category="structure notes" file="strc-tnt.mkiv">
+    <cd:command name="setuptextnote" level="style" category="structure" keywords="notes" file="strc-tnt.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -753,7 +753,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="textnote" generated="yes" level="document" category="structure notes" file="strc-tnt.mkiv">
+    <cd:command name="textnote" generated="yes" level="document" category="structure" keywords="notes" file="strc-tnt.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptextnote"/>
diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml
index ee692b396..b5768d012 100644
--- a/tex/context/interface/mkiv/i-object.xml
+++ b/tex/context/interface/mkiv/i-object.xml
@@ -93,7 +93,7 @@
 
     <cd:command name="defaultobjectpage" level="system" category="pdf" file="pack-obj.mkiv"/>
 
-    <cd:command name="doifelseobjectfound" level="system" category="pdf conditional" file="pack-obj.mkiv">
+    <cd:command name="doifelseobjectfound" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -102,7 +102,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifobjectfoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv">
+    <cd:command name="doifobjectfoundelse" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -111,7 +111,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseobjectreferencefound" level="system" category="pdf conditional" file="pack-obj.mkiv">
+    <cd:command name="doifelseobjectreferencefound" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -120,7 +120,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv">
+    <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf" keywords="conditional" file="pack-obj.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml
index ddc54736e..eca889a35 100644
--- a/tex/context/interface/mkiv/i-offset.xml
+++ b/tex/context/interface/mkiv/i-offset.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupoffsetbox" level="style" category="layout" file="pack-box.mkiv">
+    <cd:command name="setupoffsetbox" level="style" category="boxes" keywords="layout" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="x">
@@ -44,7 +44,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupoffset" level="style" category="layout" file="pack-box.mkiv">
+    <cd:command name="setupoffset" level="style" category="boxes" keywords="layout" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupoffsetbox"/>
@@ -52,7 +52,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="offsetbox" level="system" category="layout" file="pack-box.mkiv">
+    <cd:command name="offsetbox" level="system" category="boxes" keywords="layout" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupoffsetbox"/>
@@ -62,7 +62,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="offset" level="document" category="layout" file="pack-box.mkiv">
+    <cd:command name="offset" level="document" category="boxes" keywords="layout" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupoffset"/>
diff --git a/tex/context/interface/mkiv/i-orientation.xml b/tex/context/interface/mkiv/i-orientation.xml
index 3731d65ba..8749bf278 100644
--- a/tex/context/interface/mkiv/i-orientation.xml
+++ b/tex/context/interface/mkiv/i-orientation.xml
@@ -58,7 +58,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseorientation" level="system" category="conditional" file="pack-ori.mkxl">
+    <cd:command name="doifelseorientation" level="system" category="alignment" keywords="conditional" file="pack-ori.mkxl">
         <cd:arguments>
             <cd:resolve name="argument-orientation"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml
index 8ee83a17e..7bc6d9f4e 100644
--- a/tex/context/interface/mkiv/i-ornament.xml
+++ b/tex/context/interface/mkiv/i-ornament.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="ornamenttext" variant="collector" level="document" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="ornamenttext" variant="collector" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="alternative">
@@ -27,7 +27,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ornamenttext" variant="layer" level="document" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="ornamenttext" variant="layer" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="alternative">
@@ -44,7 +44,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ornamenttext" variant="direct" level="document" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="ornamenttext" variant="direct" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="argument-text"/>
@@ -52,7 +52,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineornament" variant="collector" level="style" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="defineornament" variant="collector" level="style" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -74,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defineornament" variant="layer" level="style" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="defineornament" variant="layer" level="style" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -90,7 +90,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ornament" generated="yes" variant="example" level="document" category="background fonts colors" file="pack-box.mkiv">
+    <cd:command name="ornament" generated="yes" variant="example" level="document" category="background" keywords="fonts colors" file="pack-box.mkiv">
         <cd:sequence>
             <cd:variable value="ornament"/>
         </cd:sequence>
diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml
index da79925a4..55773c625 100644
--- a/tex/context/interface/mkiv/i-overlay.xml
+++ b/tex/context/interface/mkiv/i-overlay.xml
@@ -12,9 +12,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="overlaycolor" level="system" category="background colors" file="pack-rul.mkiv"/>
+    <cd:command name="overlaycolor" level="system" category="background colors" keywords="background colors" file="pack-rul.mkiv"/>
 
-    <cd:command name="overlaylinecolor" level="system" category="background colors" file="pack-rul.mkiv"/>
+    <cd:command name="overlaylinecolor" level="system" category="background colors" keywords="background colors" file="pack-rul.mkiv"/>
 
     <cd:command name="overlaywidth" level="system" category="background" file="pack-rul.mkiv"/>
 
@@ -26,7 +26,7 @@
 
     <cd:command name="overlaylinewidth" level="system" category="background" file="pack-rul.mkiv"/>
 
-    <cd:command name="doifelseoverlay" level="system" category="background conditional" file="pack-rul.mkiv">
+    <cd:command name="doifelseoverlay" level="system" category="background" keywords="conditional" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -34,7 +34,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoverlayelse" level="system" category="background conditional" file="pack-rul.mkiv">
+    <cd:command name="doifoverlayelse" level="system" category="background" keywords="conditional" file="pack-rul.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml
index 8858c41c4..a6a5a8697 100644
--- a/tex/context/interface/mkiv/i-pagebreak.xml
+++ b/tex/context/interface/mkiv/i-pagebreak.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definepagebreak" level="style" file="page-brk.mkiv">
+    <cd:command name="definepagebreak" level="style" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes">
@@ -13,7 +13,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagebreak" level="document" file="page-brk.mkiv">
+    <cd:command name="pagebreak" level="document" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:resolve name="value-pagebreak"/>
@@ -22,7 +22,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="page" level="document" file="page-brk.mkiv">
+    <cd:command name="page" level="document" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="pagebreak"/>
@@ -30,7 +30,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecolumnbreak" level="style" file="page-brk.mkiv">
+    <cd:command name="definecolumnbreak" level="style" category="structure" keywords="columns" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes">
@@ -39,7 +39,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="columnbreak" level="document" file="page-brk.mkiv">
+    <cd:command name="columnbreak" level="document" category="structure" keywords="columns" file="page-brk.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:resolve name="value-columnbreak"/>
@@ -48,7 +48,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="column" level="document" file="page-brk.mkiv">
+    <cd:command name="column" level="document" category="structure" keywords="columns" file="page-brk.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="columnbreak"/>
@@ -56,7 +56,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definepagechecker" level="style" file="page-brk.mkiv">
+    <cd:command name="definepagechecker" level="style" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -66,7 +66,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppagechecker" level="style" file="page-brk.mkiv">
+    <cd:command name="setuppagechecker" level="style" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -95,7 +95,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkpage" level="document" file="page-brk.mkiv">
+    <cd:command name="checkpage" level="document" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -104,28 +104,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testpage" level="document" file="page-brk.mkiv">
+    <cd:command name="testpage" level="document" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number"/>
             <cd:resolve name="keyword-dimension-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testpageonly" level="system" file="page-brk.mkiv">
+    <cd:command name="testpageonly" level="system" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number"/>
             <cd:resolve name="keyword-dimension-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testpagesync" level="system" file="page-brk.mkiv">
+    <cd:command name="testpagesync" level="system" category="structure" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number"/>
             <cd:resolve name="keyword-dimension-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testcolumn" level="document" file="page-brk.mkiv">
+    <cd:command name="testcolumn" level="document" category="structure" keywords="columns" file="page-brk.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-number"/>
             <cd:resolve name="keyword-dimension-optional"/>
diff --git a/tex/context/interface/mkiv/i-pagecolumns.xml b/tex/context/interface/mkiv/i-pagecolumns.xml
index 07ab20abb..abeedb8b8 100644
--- a/tex/context/interface/mkiv/i-pagecolumns.xml
+++ b/tex/context/interface/mkiv/i-pagecolumns.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definepagecolumns" level="style" category="structure layout" file="page-pcl.mkiv">
+    <cd:command name="definepagecolumns" level="style" category="columns" keywords="structure layout" file="page-pcl.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppagecolumns" level="style" category="structure layout" file="page-pcl.mkiv">
+    <cd:command name="setuppagecolumns" level="style" category="columns" keywords="structure layout" file="page-pcl.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -67,13 +67,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="structure layout" file="page-pcl.mkiv">
+    <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagecolumns" type="environment" level="document" category="structure layout" file="page-pcl.mkiv">
+    <cd:command name="pagecolumns" type="environment" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuppagecolumns"/>
@@ -81,7 +81,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-pcl.mkiv">
+    <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="columns" keywords="structure layout" file="page-pcl.mkiv">
         <cd:sequence>
             <cd:instance value="pagecolumns"/>
         </cd:sequence>
diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml
index b1ccd82ef..be394ba5a 100644
--- a/tex/context/interface/mkiv/i-pagegrid.xml
+++ b/tex/context/interface/mkiv/i-pagegrid.xml
@@ -6,7 +6,7 @@
 
     <!--
 
-        <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="definepagegrid" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -18,7 +18,7 @@
 
     -->
 
-    <cd:command name="definecolumnset" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="definecolumnset" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -30,7 +30,7 @@
 
     <!--
 
-        <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegrid" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:keywords list="yes" optional="yes">
                     <cd:constant type="cd:name"/>
@@ -76,7 +76,7 @@
 
     -->
 
-    <cd:command name="setupcolumnset" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnset" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="cd:name"/>
@@ -124,7 +124,7 @@
 
     <!--
 
-        <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv">
+        <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:sequence>
                 <cd:variable value="pagegrid"/>
             </cd:sequence>
@@ -135,7 +135,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv">
+        <cd:command name="pagegrid" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name-optional"/>
                 <cd:assignments list="yes" optional="yes">
@@ -146,7 +146,7 @@
 
     -->
 
-    <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv">
+    <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:sequence>
             <cd:variable value="columnset"/>
         </cd:sequence>
@@ -157,7 +157,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="columnset" type="environment" level="document" category="layout" file="page-cst.mkiv">
+    <cd:command name="columnset" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -168,7 +168,7 @@
 
     <!--
 
-        <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv">
+        <cd:command name="setpagegrid" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:parameter name="c">
@@ -186,7 +186,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="definepagegridspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -198,7 +198,7 @@
 
     -->
 
-    <cd:command name="definecolumnsetspan" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="definecolumnsetspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -210,7 +210,7 @@
 
     <!--
 
-        <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegridspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -236,7 +236,7 @@
 
     -->
 
-    <cd:command name="setupcolumnsetspan" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnsetspan" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -262,7 +262,7 @@
 
     <!--
 
-        <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv">
+        <cd:command name="pagegridspan" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:assignments list="yes" optional="yes">
@@ -273,7 +273,7 @@
 
     -->
 
-    <cd:command name="columnsetspan" type="environment" level="document" category="layout" file="page-cst.mkiv">
+    <cd:command name="columnsetspan" type="environment" level="document" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -306,7 +306,7 @@
 
     <!--
 
-        <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="pagegridspanwidth" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="argument-number"/>
             </cd:arguments>
@@ -314,7 +314,7 @@
 
     -->
 
-    <cd:command name="columnsetspanwidth" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="columnsetspanwidth" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
@@ -322,7 +322,7 @@
 
     <!--
 
-        <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="definepagegridarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-name-optional"/>
@@ -334,7 +334,7 @@
 
     -->
 
-    <cd:command name="definecolumnsetarea" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="definecolumnsetarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -346,7 +346,7 @@
 
     <!--
 
-        <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegridarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name-list-optional"/>
                 <cd:assignments list="yes">
@@ -386,7 +386,7 @@
 
     -->
 
-    <cd:command name="setupcolumnsetarea" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnsetarea" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -426,7 +426,7 @@
 
     <!--
 
-        <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegridareatext" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-text"/>
@@ -435,7 +435,7 @@
 
     -->
 
-    <cd:command name="setupcolumnsetareatext" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnsetareatext" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-text"/>
@@ -444,7 +444,7 @@
 
     <!--
 
-        <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegridlines" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-number"/>
@@ -455,7 +455,7 @@
 
     -->
 
-    <cd:command name="setupcolumnsetlines" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnsetlines" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-number"/>
@@ -466,7 +466,7 @@
 
     <!--
 
-        <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv">
+        <cd:command name="setuppagegridstart" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
             <cd:arguments>
                 <cd:resolve name="keyword-name"/>
                 <cd:resolve name="keyword-number"/>
@@ -477,7 +477,7 @@
 
     -->
 
-    <cd:command name="setupcolumnsetstart" level="style" category="layout" file="page-cst.mkiv">
+    <cd:command name="setupcolumnsetstart" level="style" category="columns" keywords="structure layout" file="page-cst.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-number"/>
diff --git a/tex/context/interface/mkiv/i-pagemarks.xml b/tex/context/interface/mkiv/i-pagemarks.xml
index 3bab14121..654db57e6 100644
--- a/tex/context/interface/mkiv/i-pagemarks.xml
+++ b/tex/context/interface/mkiv/i-pagemarks.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="markpage" level="style" file="page-ini.mkiv">
+    <cd:command name="markpage" level="style" category="structure" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -13,19 +13,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="markedpages" level="style" file="page-ini.mkiv">
+    <cd:command name="markedpages" level="style" category="structure" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="markpages" type="environment" level="style" file="page-ini.mkiv">
+    <cd:command name="markpages" type="environment" level="style" category="structure" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-ini.mkiv">
+    <cd:command name="doifelsemarkedpage" level="style" category="structure" keywords="conditional" file="page-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml
index 20414d9c3..47563984e 100644
--- a/tex/context/interface/mkiv/i-pagenumber.xml
+++ b/tex/context/interface/mkiv/i-pagenumber.xml
@@ -20,7 +20,7 @@
         </cd:assignments>
     </cd:define>
 
-    <cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv">
+    <cd:command name="setuprealpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupcounter"/>
@@ -28,13 +28,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv">
+    <cd:command name="setupuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-setupuserpagenumber"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupsubpagenumber" level="style" category="counter" file="strc-pag.mkiv">
+    <cd:command name="setupsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:inherit name="setupcounter"/>
@@ -42,7 +42,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv">
+    <cd:command name="setuppagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-setupuserpagenumber"/>
         </cd:arguments>
@@ -54,13 +54,13 @@
 
     -->
 
-    <cd:command name="resetuserpagenumber" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="resetuserpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="resetsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="resetsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="resetpagenumber" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="resetpagenumber" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="setuppagenumbering" level="style" category="counter" file="strc-pag.mkiv">
+    <cd:command name="setuppagenumbering" level="style" category="counter" keywords="structure" file="strc-pag.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="alternative">
@@ -113,74 +113,74 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="firstuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="firstsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextrealpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextuserpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="firstrealpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="firstuserpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="firstsubpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="firstsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevrealpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevuserpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prevsubpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prevsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextrealpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextuserpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="nextsubpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="nextsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastrealpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastrealpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastuserpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastuserpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="lastsubpage" level="system" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="lastsubpage" level="system" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="realpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="realpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="userpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="userpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="subpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="subpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="pagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="pagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="prefixedpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="prefixedpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="incrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="incrementpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="incrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="incrementsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="decrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="decrementpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="decrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="decrementsubpagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="completepagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="completepagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
-    <cd:command name="placepagenumber" level="style" category="counter" file="strc-pag.mkiv"/>
+    <cd:command name="placepagenumber" level="style" category="counter" keywords="structure" file="strc-pag.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml
index 90d419bbc..5432ca34e 100644
--- a/tex/context/interface/mkiv/i-pageselection.xml
+++ b/tex/context/interface/mkiv/i-pageselection.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="insertpages" level="document" file="page-sel.mkvi">
+    <cd:command name="insertpages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
             <cd:resolve name="keyword-number-list-optional"/>
@@ -22,7 +22,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filterpages" level="document" file="page-sel.mkvi">
+    <cd:command name="filterpages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
             <cd:keywords list="yes">
@@ -45,7 +45,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="copypages" level="document" file="page-sel.mkvi">
+    <cd:command name="copypages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
             <cd:assignments list="yes" optional="yes">
@@ -66,7 +66,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="combinepages" level="document" file="page-sel.mkvi">
+    <cd:command name="combinepages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
             <cd:assignments list="yes" optional="yes">
@@ -132,7 +132,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="slicepages" level="document" file="page-sel.mkvi">
+    <cd:command name="slicepages" level="document" category="graphics" keywords="structure" file="page-sel.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-file"/>
             <cd:assignments list="yes" optional="yes">
diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml
index 779304d6c..c0b167464 100644
--- a/tex/context/interface/mkiv/i-pageshift.xml
+++ b/tex/context/interface/mkiv/i-pageshift.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definepageshift" level="style" file="page-imp.mkiv">
+    <cd:command name="definepageshift" level="style" category="layout" file="page-imp.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -15,7 +15,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppageshift" level="style" file="page-imp.mkiv">
+    <cd:command name="setuppageshift" level="style" category="layout" file="page-imp.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="page" default="yes"/>
diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml
index 68f98e0f0..699b1fcda 100644
--- a/tex/context/interface/mkiv/i-pagestate.xml
+++ b/tex/context/interface/mkiv/i-pagestate.xml
@@ -4,25 +4,25 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="signalrightpage" level="system" file="spac-pag.mkiv"/>
+    <cd:command name="signalrightpage" level="system" category="twopassdata" file="spac-pag.mkiv"/>
 
-    <cd:command name="doifelserightpage" level="system" file="spac-pag.mkiv">
+    <cd:command name="doifelserightpage" level="system" category="twopassdata" keywords="conditional" file="spac-pag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifrightpageelse" level="system" file="spac-pag.mkiv">
+    <cd:command name="doifrightpageelse" level="system" category="twopassdata" keywords="conditional" file="spac-pag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rightpageorder" level="system" file="spac-pag.mkiv"/>
+    <cd:command name="rightpageorder" level="system" category="twopassdata" file="spac-pag.mkiv"/>
 
-    <cd:command name="definepagestate" level="system" file="core-dat.mkiv">
+    <cd:command name="definepagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -32,7 +32,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppagestate" level="system" file="core-dat.mkiv">
+    <cd:command name="setuppagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -44,7 +44,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setpagestate" level="system" file="core-dat.mkiv">
+    <cd:command name="setpagestate" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords optional="yes">
@@ -54,7 +54,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagestaterealpage" level="system" file="core-dat.mkiv">
+    <cd:command name="pagestaterealpage" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -64,7 +64,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setpagestaterealpageno" level="system" file="core-dat.mkiv">
+    <cd:command name="setpagestaterealpageno" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -74,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pagestaterealpageorder" level="system" file="core-dat.mkiv">
+    <cd:command name="pagestaterealpageorder" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces">
@@ -84,19 +84,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autopagestaterealpage" level="system" file="core-dat.mkiv">
+    <cd:command name="autopagestaterealpage" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setautopagestaterealpageno" level="system" file="core-dat.mkiv">
+    <cd:command name="setautopagestaterealpageno" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autopagestaterealpageorder" level="system" file="core-dat.mkiv">
+    <cd:command name="autopagestaterealpageorder" level="system" category="twopassdata" keywords="counter pagenumber" file="core-dat.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml
index f80ed4f53..0c9e05346 100644
--- a/tex/context/interface/mkiv/i-pairedbox.xml
+++ b/tex/context/interface/mkiv/i-pairedbox.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definepairedbox" level="style" file="pack-com.mkiv">
+    <cd:command name="definepairedbox" level="style" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppairedbox" level="style" file="pack-com.mkiv">
+    <cd:command name="setuppairedbox" level="style" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -70,7 +70,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placepairedbox" level="document" file="pack-com.mkiv">
+    <cd:command name="placepairedbox" level="document" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -81,7 +81,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placepairedbox" type="environment" level="document" file="pack-com.mkiv">
+    <cd:command name="placepairedbox" type="environment" level="document" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -90,7 +90,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" file="pack-com.mkiv">
+    <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" category="tables" file="pack-com.mkiv">
         <cd:sequence>
             <cd:string value="setup"/>
             <cd:instance value="pairedbox"/>
@@ -105,7 +105,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" file="pack-com.mkiv">
+    <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" category="tables" file="pack-com.mkiv">
         <cd:sequence>
             <cd:string value="place"/>
             <cd:instance value="pairedbox"/>
@@ -122,7 +122,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" file="pack-com.mkiv">
+    <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" category="tables" file="pack-com.mkiv">
         <cd:sequence>
             <cd:string value="place"/>
             <cd:instance value="pairedbox"/>
@@ -139,7 +139,7 @@
 
     <!--
 
-        <cd:command name="setuplegend" level="document" file="pack-com.mkiv">
+        <cd:command name="setuplegend" level="document" category="tables" file="pack-com.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes">
                     <cd:inherit name="setuppairedbox"/>
@@ -147,7 +147,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelegend" level="document" file="pack-com.mkiv">
+        <cd:command name="placelegend" level="document" category="tables" file="pack-com.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuppairedbox"/>
@@ -157,7 +157,7 @@
             </cd:arguments>
         </cd:command>
 
-        <cd:command name="placelegend" type="environment" level="document" file="pack-com.mkiv">
+        <cd:command name="placelegend" type="environment" level="document" category="tables" file="pack-com.mkiv">
             <cd:arguments>
                 <cd:assignments list="yes" optional="yes">
                     <cd:inherit name="setuppairedbox"/>
@@ -167,14 +167,14 @@
 
     -->
 
-    <cd:command name="placeontopofeachother" level="document" file="pack-com.mkiv">
+    <cd:command name="placeontopofeachother" level="document" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placesidebyside" level="document" file="pack-com.mkiv">
+    <cd:command name="placesidebyside" level="document" category="tables" file="pack-com.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml
index 144619088..1a3c7cb42 100644
--- a/tex/context/interface/mkiv/i-paragraphnumber.xml
+++ b/tex/context/interface/mkiv/i-paragraphnumber.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupparagraphnumbering" level="style" category="structure counter" file="page-par.mkiv">
+    <cd:command name="setupparagraphnumbering" level="style" category="structure" keywords="counter" file="page-par.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="state">
diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml
index c182df093..365e4beb6 100644
--- a/tex/context/interface/mkiv/i-parallel.xml
+++ b/tex/context/interface/mkiv/i-parallel.xml
@@ -4,14 +4,14 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineparallel" level="style" file="buff-par.mkvi">
+    <cd:command name="defineparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupparallel" level="style" file="buff-par.mkvi">
+    <cd:command name="setupparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-list"/>
@@ -32,7 +32,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placeparallel" level="document" file="buff-par.mkvi">
+    <cd:command name="placeparallel" level="document" category="columns" keywords="structure" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-list"/>
@@ -42,7 +42,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseparallel" level="style" category="conditional" file="buff-par.mkvi">
+    <cd:command name="doifelseparallel" level="style" category="columns" keywords="structure conditional" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces" list="yes">
@@ -54,7 +54,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifparallelelse" level="style" category="conditional" file="buff-par.mkvi">
+    <cd:command name="doifparallelelse" level="style" category="columns" keywords="structure conditional" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:keywords delimiters="braces" list="yes">
@@ -66,7 +66,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetparallel" level="style" file="buff-par.mkvi">
+    <cd:command name="resetparallel" level="style" category="columns" keywords="structure" file="buff-par.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords list="yes" optional="yes">
@@ -76,7 +76,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" file="buff-par.mkvi">
+    <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" category="columns" keywords="structure" file="buff-par.mkvi">
         <cd:sequence>
             <cd:variable value="parallel"/>
         </cd:sequence>
diff --git a/tex/context/interface/mkiv/i-phantom.xml b/tex/context/interface/mkiv/i-phantom.xml
index 8efca3ce6..2d5e152cc 100644
--- a/tex/context/interface/mkiv/i-phantom.xml
+++ b/tex/context/interface/mkiv/i-phantom.xml
@@ -4,25 +4,25 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="phantom" level="style" file="supp-box.mkiv">
+    <cd:command name="phantom" level="style" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hphantom" level="style" file="supp-box.mkiv">
+    <cd:command name="hphantom" level="style" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vphantom" level="style" file="supp-box.mkiv">
+    <cd:command name="vphantom" level="style" category="strings" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="phantombox" level="style" file="pack-box.mkiv">
+    <cd:command name="phantombox" level="style" category="boxes" keywords="strings" file="pack-box.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="width">
diff --git a/tex/context/interface/mkiv/i-placeholder.xml b/tex/context/interface/mkiv/i-placeholder.xml
new file mode 100644
index 000000000..cbabf73ff
--- /dev/null
+++ b/tex/context/interface/mkiv/i-placeholder.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?context-directive job ctxfile x-setups.ctx ?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+
+    <cd:command name="defineplaceholder" level="style" category="structure" file="typo-plc.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="keyword-name-optional"/>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupplaceholder"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="setupplaceholder" level="style" category="structure" file="typo-plc.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
+            <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:resolve name="value-style"/>
+                </cd:parameter>
+                <cd:parameter name="color">
+                    <cd:constant type="cd:color"/>
+                </cd:parameter>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="placeholder" level="document" category="structure" file="typo-plc.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+        </cd:arguments>
+    </cd:command>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml
index 2e62592ba..435f58ebb 100644
--- a/tex/context/interface/mkiv/i-position.xml
+++ b/tex/context/interface/mkiv/i-position.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="doifpositionaction" level="system" category="conditional" file="anch-pgr.mkiv">
+    <cd:command name="doifpositionaction" level="system" keywords="conditional" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepositionaction" level="system" category="conditional" file="anch-pgr.mkiv">
+    <cd:command name="doifelsepositionaction" level="system" keywords="conditional" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -20,7 +20,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositionactionelse" level="system" category="conditional" file="anch-pgr.mkiv">
+    <cd:command name="doifpositionactionelse" level="system" keywords="conditional" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -40,7 +40,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPoverlayanchor" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPoverlayanchor" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
@@ -59,14 +59,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPpositiongraphic" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPpositiongraphic" type="environment" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key-list-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPpositiongraphic" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:assignments delimiters="braces" list="yes" optional="yes">
@@ -77,13 +77,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPpositionmethod" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPpositionmethod" type="environment" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setMPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="setMPpositiongraphic" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -95,7 +95,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setMPpositiongraphicrange" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="setMPpositiongraphicrange" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -108,21 +108,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPgetposboxes" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPgetposboxes" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPgetmultipars" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPgetmultipars" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="MPgetmultishape" level="system" category="background metapost" file="anch-pgr.mkiv">
+    <cd:command name="MPgetmultishape" level="system" category="background" keywords="metapost" file="anch-pgr.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -386,7 +386,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifposition" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifposition" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -394,7 +394,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseposition" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelseposition" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -402,7 +402,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositionelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifpositionelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -410,7 +410,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepositiononpage" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelsepositiononpage" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -419,7 +419,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositiononpageelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifpositiononpageelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -467,7 +467,7 @@
 
     <cd:command name="disableparpositions" level="system" file="anch-pos.mkiv"/>
 
-    <cd:command name="doifelseoverlapping" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelseoverlapping" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -476,7 +476,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoverlappingelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifoverlappingelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -485,7 +485,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepositionsonsamepage" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelsepositionsonsamepage" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -493,7 +493,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositionsonsamepageelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifpositionsonsamepageelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -501,7 +501,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepositionsonthispage" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelsepositionsonthispage" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -509,7 +509,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositionsonthispageelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifpositionsonthispageelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -517,14 +517,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsepositionsused" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifelsepositionsused" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifpositionsusedelse" level="system" category="conditional" file="anch-pos.mkiv">
+    <cd:command name="doifpositionsusedelse" level="system" keywords="conditional" file="anch-pos.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml
index 364e428a1..2b0f66e36 100644
--- a/tex/context/interface/mkiv/i-processor.xml
+++ b/tex/context/interface/mkiv/i-processor.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineprocessor" level="style" category="fonts colors" file="typo-prc.mkvi">
+    <cd:command name="defineprocessor" level="style" category="fonts" keywords="colors" file="typo-prc.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupprocessor" level="style" category="fonts colors" file="typo-prc.mkvi">
+    <cd:command name="setupprocessor" level="style" category="fonts" keywords="colors" file="typo-prc.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -41,7 +41,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="applyprocessor" level="system" category="fonts colors" file="typo-prc.mkvi">
+    <cd:command name="applyprocessor" level="system" category="fonts" keywords="colors" file="typo-prc.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml
index a13a06d8d..e77274869 100644
--- a/tex/context/interface/mkiv/i-publication.xml
+++ b/tex/context/interface/mkiv/i-publication.xml
@@ -807,7 +807,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifelse" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-btxfield"/>
             <cd:resolve name="argument-true"/>
@@ -815,14 +815,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoif" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoif" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-btxfield"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifnot" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifnot" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-btxfield"/>
             <cd:resolve name="argument-true"/>
@@ -835,7 +835,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="always"/>
@@ -847,7 +847,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-btxfield"/>
             <cd:resolve name="argument-true"/>
@@ -855,7 +855,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -864,7 +864,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="always"/>
@@ -876,7 +876,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-btxfield"/>
             <cd:resolve name="argument-true"/>
@@ -884,7 +884,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -899,7 +899,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifelseuservariable" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifelseuservariable" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
@@ -907,7 +907,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxdoifuservariableelse" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxdoifuservariableelse" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
@@ -967,7 +967,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxsingularplural" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxsingularplural" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="editor"/>
@@ -979,7 +979,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxsingularorplural" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxsingularorplural" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="editor"/>
@@ -991,7 +991,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="btxoneorrange" level="system" category="bibliography conditional" file="publ-ini.mkiv">
+    <cd:command name="btxoneorrange" level="system" category="bibliography" keywords="conditional" file="publ-ini.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="volume"/>
diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml
index 1bf425898..8237a4cb9 100644
--- a/tex/context/interface/mkiv/i-random.xml
+++ b/tex/context/interface/mkiv/i-random.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="getrandomcount" level="system" file="supp-ran.mkiv">
+    <cd:command name="getrandomcount" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-number"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrandomdimen" level="system" file="supp-ran.mkiv">
+    <cd:command name="getrandomdimen" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dimension"/>
@@ -20,7 +20,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrandomnumber" level="system" file="supp-ran.mkiv">
+    <cd:command name="getrandomnumber" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-number"/>
@@ -28,7 +28,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrandomfloat" level="system" file="supp-ran.mkiv">
+    <cd:command name="getrandomfloat" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-number"/>
@@ -36,29 +36,29 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setrandomseed" level="system" file="supp-ran.mkiv">
+    <cd:command name="setrandomseed" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrandomseed" level="system" file="supp-ran.mkiv">
+    <cd:command name="getrandomseed" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" file="supp-ran.mkiv"/>
+    <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" category="counter" file="supp-ran.mkiv"/>
 
-    <cd:command name="reuserandomseed" level="system" file="supp-ran.mkiv"/>
+    <cd:command name="reuserandomseed" level="system" category="counter" file="supp-ran.mkiv"/>
 
-    <cd:command name="randomnumber" level="system" file="supp-ran.mkiv">
+    <cd:command name="randomnumber" level="system" category="counter" file="supp-ran.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="mprandomnumber" level="system" file="supp-ran.mkiv"/>
+    <cd:command name="mprandomnumber" level="system" category="counter" keywords="metapost" file="supp-ran.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 4eb6b1845..44f939cca 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/interface/mkiv/i-references.xml b/tex/context/interface/mkiv/i-references.xml
index a04b589a3..2774dd396 100644
--- a/tex/context/interface/mkiv/i-references.xml
+++ b/tex/context/interface/mkiv/i-references.xml
@@ -148,7 +148,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsereferencefound" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doifelsereferencefound" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-reference"/>
             <cd:resolve name="argument-true"/>
@@ -156,7 +156,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifreferencefoundelse" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doifreferencefoundelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-reference"/>
             <cd:resolve name="argument-true"/>
@@ -421,7 +421,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseurldefined" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doifelseurldefined" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -429,7 +429,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifurldefinedelse" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doifurldefinedelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -437,7 +437,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefiledefined" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doifelsefiledefined" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -445,7 +445,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffiledefinedelse" level="system" category="references conditional" file="strc-ref.mkvi">
+    <cd:command name="doiffiledefinedelse" level="system" category="references" keywords="conditional" file="strc-ref.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml
index fff39f665..65553cdf5 100644
--- a/tex/context/interface/mkiv/i-ruby.xml
+++ b/tex/context/interface/mkiv/i-ruby.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineruby" level="style" category="fonts" file="typo-rub.mkiv">
+    <cd:command name="defineruby" level="style" category="language" keywords="fonts" file="typo-rub.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupruby" level="style" category="fonts" file="typo-rub.mkiv">
+    <cd:command name="setupruby" level="style" category="language" keywords="fonts" file="typo-rub.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -60,7 +60,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruby" level="document" category="fonts" file="typo-rub.mkiv">
+    <cd:command name="ruby" level="document" category="language" keywords="fonts" file="typo-rub.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="argument-text"/>
@@ -68,7 +68,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruby" type="environment" level="document" category="fonts" file="typo-rub.mkiv">
+    <cd:command name="ruby" type="environment" level="document" category="language" keywords="fonts" file="typo-rub.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml
index da5c5049d..4e5b44a29 100644
--- a/tex/context/interface/mkiv/i-script.xml
+++ b/tex/context/interface/mkiv/i-script.xml
@@ -24,6 +24,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">
@@ -65,7 +66,7 @@
 
     <cd:command name="resetscript" level="system" category="language" file="scrp-ini.mkvi"/>
 
-    <cd:command name="script" type="environment" category="language" file="scrp-ini.mkvi">
+    <cd:command name="script" type="environment" level="document" category="language" file="scrp-ini.mkvi">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="hangul"/>
@@ -73,6 +74,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>
diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml
index ce9a90e9e..d70bb7ab7 100644
--- a/tex/context/interface/mkiv/i-selector.xml
+++ b/tex/context/interface/mkiv/i-selector.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineselector" level="style" file="core-env.mkiv">
+    <cd:command name="defineselector" level="style" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes" optional="yes">
@@ -13,21 +13,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupselector" level="style" file="core-env.mkiv">
+    <cd:command name="setupselector" level="style" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
                 <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 name="select" level="document" file="core-env.mkiv">
+    <cd:command name="select" level="document" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content optional="yes"/>
@@ -38,7 +38,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directselect" level="system" file="core-env.mkiv">
+    <cd:command name="directselect" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content optional="yes"/>
diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml
index fe41ff18d..fcfed31bf 100644
--- a/tex/context/interface/mkiv/i-setup.xml
+++ b/tex/context/interface/mkiv/i-setup.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupsetup" level="style" file="x-setups-basics.mkiv">
+    <cd:command name="setupsetup" level="style" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="criterium">
@@ -19,149 +19,149 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="basicsetup" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="basicsetup" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="basicsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="basicsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shortsetup" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="shortsetup" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="shortsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="shortsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="setup" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" variant="argument" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="setup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showsetup" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="showsetup" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showsetup" variant="argument" level="system" file="x-setups-basics.mkiv">
+    <cd:command name="showsetup" variant="argument" level="system" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placesetup" level="document" file="x-setups-basics.mkiv"/>
+    <cd:command name="placesetup" level="document" category="xml" file="x-setups-basics.mkiv"/>
 
-    <cd:command name="placeallsetups" level="document" file="x-setups-basics.mkiv"/>
+    <cd:command name="placeallsetups" level="document" category="xml" file="x-setups-basics.mkiv"/>
 
-    <cd:command name="placeeverysetup" level="document" file="x-setups-basics.mkiv"/>
+    <cd:command name="placeeverysetup" level="document" category="xml" file="x-setups-basics.mkiv"/>
 
-    <cd:command name="showrootvalues" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="showrootvalues" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showinstancevalues" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="showinstancevalues" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdinternal" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdinternal" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetup" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetup" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetup" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetup" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetup" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetup" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetup" variant="argument" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetup" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdbasicsetupinstance" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdbasicsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdshortsetupinstance" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdshortsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="cmdfullsetupinstance" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="cmdfullsetupinstance" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showdefinition" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="showdefinition" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showdefinition" variant="argument" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="showdefinition" variant="argument" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definition" level="document" file="x-setups-basics.mkiv">
+    <cd:command name="definition" level="document" category="xml" file="x-setups-basics.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text-list"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml
index a3773e8f7..da0a75cb2 100644
--- a/tex/context/interface/mkiv/i-setups.xml
+++ b/tex/context/interface/mkiv/i-setups.xml
@@ -4,126 +4,126 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setups" level="style" file="core-env.mkiv">
+    <cd:command name="setups" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setups" variant="direct" level="style" file="core-env.mkiv">
+    <cd:command name="setups" variant="direct" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" level="style" file="core-env.mkiv">
+    <cd:command name="setup" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setup" variant="direct" level="style" file="core-env.mkiv">
+    <cd:command name="setup" variant="direct" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directsetup" level="style" file="core-env.mkiv">
+    <cd:command name="directsetup" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastsetup" level="style" file="core-env.mkiv">
+    <cd:command name="fastsetup" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texsetup" level="style" file="core-env.mkiv">
+    <cd:command name="texsetup" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luasetup" level="style" category="lua" file="core-env.mkiv">
+    <cd:command name="luasetup" level="style" category="structure" keywords="lua" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="systemsetups" level="system" file="core-env.mkiv">
+    <cd:command name="systemsetups" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetsetups" level="system" file="core-env.mkiv">
+    <cd:command name="resetsetups" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="copysetups" level="system" file="core-env.mkiv">
+    <cd:command name="copysetups" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showsetupsdefinition" level="system" file="core-env.mkiv">
+    <cd:command name="showsetupsdefinition" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupwithargument" level="system" file="core-env.mkiv">
+    <cd:command name="setupwithargument" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastsetupwithargument" level="system" file="core-env.mkiv">
+    <cd:command name="fastsetupwithargument" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupwithargumentswapped" level="system" file="core-env.mkiv">
+    <cd:command name="setupwithargumentswapped" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastsetupwithargumentswapped" level="system" file="core-env.mkiv">
+    <cd:command name="fastsetupwithargumentswapped" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="usesetupsparameter" level="system" file="core-env.mkiv">
+    <cd:command name="usesetupsparameter" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="autosetups" level="style" file="core-env.mkiv">
+    <cd:command name="autosetups" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doprocesslocalsetups" level="system" file="core-env.mkiv">
+    <cd:command name="doprocesslocalsetups" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesetups" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifelsesetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -131,7 +131,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsetupselse" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifsetupselse" level="system" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -139,21 +139,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsetups" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifsetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotsetups" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifnotsetups" level="system" category="structure" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luasetups" type="environment" level="system" category="lua" file="core-env.mkiv">
+    <cd:command name="luasetups" type="environment" level="system" category="structure" keywords="lua" file="core-env.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="grid"/>
@@ -162,13 +162,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luasetups" type="environment" variant="string" level="system" category="lua" file="core-env.mkiv">
+    <cd:command name="luasetups" type="environment" variant="string" level="system" category="structure" keywords="lua" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xmlsetups" type="environment" level="style" category="xml" file="core-env.mkiv">
+    <cd:command name="xmlsetups" type="environment" level="style" category="structure" keywords="xml" file="core-env.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="grid"/>
@@ -177,13 +177,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="xml" file="core-env.mkiv">
+    <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="structure" keywords="xml" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawsetups" type="environment" level="system" file="core-env.mkiv">
+    <cd:command name="rawsetups" type="environment" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="grid"/>
@@ -192,13 +192,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawsetups" type="environment" variant="string" level="system" file="core-env.mkiv">
+    <cd:command name="rawsetups" type="environment" variant="string" level="system" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localsetups" type="environment" level="style" file="core-env.mkiv">
+    <cd:command name="localsetups" type="environment" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="grid"/>
@@ -207,13 +207,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localsetups" type="environment" variant="string" level="style" file="core-env.mkiv">
+    <cd:command name="localsetups" type="environment" variant="string" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setups" type="environment" level="style" file="core-env.mkiv">
+    <cd:command name="setups" type="environment" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="grid"/>
@@ -222,7 +222,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setups" type="environment" variant="string" level="style" file="core-env.mkiv">
+    <cd:command name="setups" type="environment" variant="string" level="style" category="structure" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-simplecolumns.xml b/tex/context/interface/mkiv/i-simplecolumns.xml
index 40829f786..fb2d7a2ed 100644
--- a/tex/context/interface/mkiv/i-simplecolumns.xml
+++ b/tex/context/interface/mkiv/i-simplecolumns.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setsimplecolumnshsize" level="system" category="structure layout" file="page-smp.mkiv">
+    <cd:command name="setsimplecolumnshsize" level="system" category="columns" keywords="structure layout" file="page-smp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="n">
@@ -23,7 +23,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplecolumns" type="environment" level="system" category="structure layout" file="page-smp.mkiv">
+    <cd:command name="simplecolumns" type="environment" level="system" category="columns" keywords="structure layout" file="page-smp.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:parameter name="n">
diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml
index 74df570e2..1e7dc2867 100644
--- a/tex/context/interface/mkiv/i-smash.xml
+++ b/tex/context/interface/mkiv/i-smash.xml
@@ -4,69 +4,69 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="smashbox" level="system" file="supp-box.mkiv">
+    <cd:command name="smashbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="smashboxed" level="system" file="supp-box.mkiv">
+    <cd:command name="smashboxed" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hsmashbox" level="system" file="supp-box.mkiv">
+    <cd:command name="hsmashbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vsmashbox" level="system" file="supp-box.mkiv">
+    <cd:command name="vsmashbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-box"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hsmash" level="system" file="supp-box.mkiv">
+    <cd:command name="hsmash" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vsmash" level="system" file="supp-box.mkiv">
+    <cd:command name="vsmash" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hsmashed" level="system" file="supp-box.mkiv">
+    <cd:command name="hsmashed" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vsmashed" level="system" file="supp-box.mkiv">
+    <cd:command name="vsmashed" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="smashedhbox" level="system" file="supp-box.mkiv">
+    <cd:command name="smashedhbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="smashedvbox" level="system" file="supp-box.mkiv">
+    <cd:command name="smashedvbox" level="system" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="smash" level="document" file="supp-box.mkiv">
+    <cd:command name="smash" level="document" category="boxes" file="supp-box.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="w"/>
diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml
index 889d20e69..1cd8419c0 100644
--- a/tex/context/interface/mkiv/i-sort.xml
+++ b/tex/context/interface/mkiv/i-sort.xml
@@ -139,7 +139,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="doifelsecurrentsortingused" level="system" category="language conditional" file="strc-syn.mkiv">
+    <cd:command name="doifelsecurrentsortingused" level="system" category="language" keywords="conditional" file="strc-syn.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml
index 6495826aa..ec7d8e8e6 100644
--- a/tex/context/interface/mkiv/i-spellchecking.xml
+++ b/tex/context/interface/mkiv/i-spellchecking.xml
@@ -9,7 +9,7 @@
             <cd:assignments list="yes">
                 <cd:parameter name="state">
                     <cd:constant type="start"/>
-                    <cd:constant type="stop" defult="yes"/>
+                    <cd:constant type="stop" default="yes"/>
                 </cd:parameter>
                 <cd:parameter name="method">
                     <cd:constant type="1"/>
diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml
index 942be9f7d..e3806ee3a 100644
--- a/tex/context/interface/mkiv/i-spreadsheet.xml
+++ b/tex/context/interface/mkiv/i-spreadsheet.xml
@@ -74,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsespreadsheetcell" level="system" category="tables conditional" file="m-spreadsheet.mkiv">
+    <cd:command name="doifelsespreadsheetcell" level="system" category="tables" keywords="conditional" file="m-spreadsheet.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="argument-number"/>
@@ -84,7 +84,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifspreadsheetcellelse" level="system" category="tables conditional" file="m-spreadsheet.mkiv">
+    <cd:command name="doifspreadsheetcellelse" level="system" category="tables" keywords="conditional" file="m-spreadsheet.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="argument-number"/>
diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml
index b392fd001..37e04553d 100644
--- a/tex/context/interface/mkiv/i-stream.xml
+++ b/tex/context/interface/mkiv/i-stream.xml
@@ -4,9 +4,9 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="currentoutputstream" level="system" file="page-str.mkiv"/>
+    <cd:command name="currentoutputstream" level="system" category="structure" file="page-str.mkiv"/>
 
-    <cd:command name="ifinoutputstream" level="system" file="page-str.mkiv">
+    <cd:command name="ifinoutputstream" level="system" category="structure" keywords="conditional" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -15,57 +15,57 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="enableoutputstream" level="system" file="page-str.mkiv">
+    <cd:command name="enableoutputstream" level="system" category="structure" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="disableoutputstream" level="system" file="page-str.mkiv"/>
+    <cd:command name="disableoutputstream" level="system" category="structure" file="page-str.mkiv"/>
 
-    <cd:command name="outputstream" type="environment" level="system" file="page-str.mkiv">
+    <cd:command name="outputstream" type="environment" level="system" category="structure" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushoutputstream" level="system" file="page-str.mkiv">
+    <cd:command name="flushoutputstream" level="system" category="structure" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="outputstreambox" level="system" file="page-str.mkiv">
+    <cd:command name="outputstreambox" level="system" category="structure" keywords="boxes" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="outputstreamcopy" level="system" file="page-str.mkiv">
+    <cd:command name="outputstreamcopy" level="system" category="structure" keywords="boxes" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="outputstreamunvbox" level="system" file="page-str.mkiv">
+    <cd:command name="outputstreamunvbox" level="system" category="structure" keywords="boxes" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="outputstreamunvcopy" level="system" file="page-str.mkiv">
+    <cd:command name="outputstreamunvcopy" level="system" category="structure" keywords="boxes" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="synchronizeoutputstreams" level="system" file="page-str.mkiv">
+    <cd:command name="synchronizeoutputstreams" level="system" category="structure" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pushoutputstream" level="system" file="page-str.mkiv">
+    <cd:command name="pushoutputstream" level="system" category="structure" file="page-str.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml
index 567881602..36c4234e0 100644
--- a/tex/context/interface/mkiv/i-string.xml
+++ b/tex/context/interface/mkiv/i-string.xml
@@ -4,61 +4,61 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="wdofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="wdofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="htofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="htofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dpofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="dpofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hdofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="hdofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="htdpofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="htdpofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="widthofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="widthofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="heightofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="heightofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="depthofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="depthofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="heightanddepthofstring" level="system" file="blob-ini.mkiv">
+    <cd:command name="heightanddepthofstring" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setwidthof" level="system" file="blob-ini.mkiv">
+    <cd:command name="setwidthof" level="system" category="strings" file="blob-ini.mkiv">
         <cd:arguments>
             <cd:text/>
             <cd:delimiter name="to"/>
diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml
index 6e566fe72..4b3994358 100644
--- a/tex/context/interface/mkiv/i-strut.xml
+++ b/tex/context/interface/mkiv/i-strut.xml
@@ -4,17 +4,17 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="strutdp" level="system" file="supp-box.mkiv"/>
+    <cd:command name="strutdp" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/>
 
-    <cd:command name="strutht" level="system" file="supp-box.mkiv"/>
+    <cd:command name="strutht" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/>
 
-    <cd:command name="strutwd" level="system" file="supp-box.mkiv"/>
+    <cd:command name="strutwd" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/>
 
-    <cd:command name="struthtdp" level="system" file="supp-box.mkiv"/>
+    <cd:command name="struthtdp" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/>
 
-    <cd:command name="strutgap" level="system" file="supp-box.mkiv"/>
+    <cd:command name="strutgap" level="system" category="fonts" keywords="whitespace" file="supp-box.mkiv"/>
 
-    <cd:command name="setupstrut" level="style" file="spac-ver.mkiv">
+    <cd:command name="setupstrut" level="style" category="fonts" keywords="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:resolve name="value-strut"/>
@@ -22,7 +22,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="synchronizestrut" level="system" file="spac-ver.mkiv">
+    <cd:command name="synchronizestrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-strut"/>
@@ -30,38 +30,38 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strut" level="style" file="spac-ver.mkiv"/>
+    <cd:command name="strut" level="style" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="halfstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="halfstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="quarterstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="quarterstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="halflinestrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="halflinestrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="noheightstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="noheightstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="depthstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="depthstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="setstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="setstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="setcharstrut" level="system" file="spac-ver.mkiv">
+    <cd:command name="setcharstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setfontstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="setfontstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="settightstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="settightstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="setcapstrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="setcapstrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="setnostrut" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="showstruts" level="document" file="spac-ver.mkiv"/>
+    <cd:command name="showstruts" level="document" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="showcolorstruts" level="document" file="spac-ver.mkiv"/>
+    <cd:command name="showcolorstruts" level="document" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="strut" type="environment" begin="beg" end="end" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="strut" type="environment" begin="beg" end="end" level="system" category="fonts" keywords="whitespace" file="spac-ver.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml
index 64a6f27dd..b4d74b1a0 100644
--- a/tex/context/interface/mkiv/i-symbol.xml
+++ b/tex/context/interface/mkiv/i-symbol.xml
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifelseinsymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -21,7 +21,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifinsymbolsetelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -30,7 +30,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifinsymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -39,7 +39,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifelsesymbolset" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -47,7 +47,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifsymbolsetelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -75,7 +75,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definefiguresymbol" level="style" category="symbols graphics" file="symb-ini.mkiv">
+    <cd:command name="definefiguresymbol" level="style" category="symbols" keywords="graphics" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="figuresymbol" level="document" category="symbols graphics" file="symb-ini.mkiv">
+    <cd:command name="figuresymbol" level="document" category="symbols" keywords="graphics" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:file"/>
@@ -100,7 +100,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesymboldefined" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifelsesymboldefined" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -108,7 +108,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsymboldefinedelse" level="system" category="symbols conditional" file="symb-ini.mkiv">
+    <cd:command name="doifsymboldefinedelse" level="system" category="symbols" keywords="conditional" file="symb-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml
index 017b688c4..31b4ae36a 100644
--- a/tex/context/interface/mkiv/i-synonym.xml
+++ b/tex/context/interface/mkiv/i-synonym.xml
@@ -159,14 +159,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols conditional" file="strc-syn.mkiv">
+    <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols" keywords="conditional" file="strc-syn.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols conditional" file="strc-syn.mkiv">
+    <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols" keywords="conditional" file="strc-syn.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml
index b7c46c9ce..08a4a917d 100644
--- a/tex/context/interface/mkiv/i-system.xml
+++ b/tex/context/interface/mkiv/i-system.xml
@@ -4,28 +4,28 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="expanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="expanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expanded" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="expanded" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="gobbleoneargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleoneargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblethreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblethreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -33,7 +33,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -42,7 +42,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -52,7 +52,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -63,7 +63,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesevenarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesevenarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -75,7 +75,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleeightarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleeightarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -88,7 +88,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleninearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleninearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -102,7 +102,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletenarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletenarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -117,20 +117,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleoneoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleoneoptional" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbletwooptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbletwooptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblethreeoptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblethreeoptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -138,7 +138,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefouroptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefouroptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -147,7 +147,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblefiveoptionals" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblefiveoptionals" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy"/>
             <cd:resolve name="keyword-dummy"/>
@@ -157,9 +157,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="donothing" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="donothing" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="doifelsenextchar" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextchar" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-true"/>
@@ -167,7 +167,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextcharelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextcharelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-true"/>
@@ -175,212 +175,212 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextoptionalelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextoptionalcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextoptionalcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextoptionalcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextoptionalcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextbgroup" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextbgroup" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextbgroupelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextbgroupelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextbgroupcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextbgroupcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextbgroupcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextbgroupcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenextparenthesis" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenextparenthesis" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnextparenthesiselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnextparenthesiselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefastoptionalcheck" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefastoptionalcheck" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffastoptionalcheckelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffastoptionalcheckelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefastoptionalcheckcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefastoptionalcheckcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffastoptionalcheckcselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffastoptionalcheckcselse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assumelongusagecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="assumelongusagecs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setxvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="getvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="resetvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="undefinevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="undefinevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ignorevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="ignorevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuevalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setugvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setugvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setuxvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="setuxvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getuvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="getuvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -388,7 +388,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifundefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifundefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -396,7 +396,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -404,7 +404,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdefinedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -412,39 +412,39 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifundefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdefined" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letbeundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="letbeundefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localundefine" level="system" file="syst-aux.mkiv">
+    <cd:command name="localundefine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalundefine" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalundefine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsealldefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsealldefined" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -452,7 +452,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifalldefinedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifalldefinedelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name-list"/>
             <cd:resolve name="argument-true"/>
@@ -460,7 +460,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doif" level="system" file="syst-aux.mkiv">
+    <cd:command name="doif" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -468,7 +468,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnot" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnot" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -476,7 +476,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -485,7 +485,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
@@ -493,7 +493,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
@@ -501,21 +501,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotempty" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -524,7 +524,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -533,7 +533,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -541,7 +541,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -549,7 +549,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsecommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsecommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -558,7 +558,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommonelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -567,7 +567,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -575,7 +575,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -583,60 +583,60 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="quitcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="quitcommalist" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="quitprevcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="quitprevcommalist" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="processcommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalistwithparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalistwithparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommalist" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommalist" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcommacommand" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcommacommand" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentcommalistitem" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentcommalistitem" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="processaction" level="system" file="syst-aux.mkiv">
+    <cd:command name="processaction" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processfirstactioninset" level="system" file="syst-aux.mkiv">
+    <cd:command name="processfirstactioninset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processallactionsinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="processallactionsinset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
@@ -645,17 +645,17 @@
 
     <cd:command name="commalistelement" level="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="firstcharacter" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="firstcharacter" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="remainingcharacters" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="remainingcharacters" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="getfirstcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfirstcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsefirstchar" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsefirstchar" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -664,7 +664,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiffirstcharelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doiffirstcharelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -673,19 +673,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thefirstcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="thefirstcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="theremainingcharacters" level="system" file="syst-aux.mkiv">
+    <cd:command name="theremainingcharacters" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -694,7 +694,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -703,7 +703,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -711,7 +711,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -719,7 +719,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseincsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseincsname" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-csname"/>
@@ -728,7 +728,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifincsnameelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifincsnameelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-csname"/>
@@ -737,7 +737,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -745,7 +745,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnumberelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnumberelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -753,21 +753,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotnumber" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="percentdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="percentdimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:dimension"/>
@@ -780,7 +780,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setpercentdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="setpercentdimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:dimension"/>
@@ -793,28 +793,28 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="makerawcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="makerawcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocesscommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocesscommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocesscommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocesscommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -823,7 +823,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -832,7 +832,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawdoifinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawdoifinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -840,123 +840,123 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawprocessaction" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawprocessaction" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command"/>
             <cd:apply list="yes"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentvalue" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentvalue" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="geteparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="geteparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getgparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getgparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getxparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getxparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forgetparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="forgetparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getexpandedparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getexpandedparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="doassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doeassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="doeassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="undoassign" level="system" file="syst-aux.mkiv">
+    <cd:command name="undoassign" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doassignempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doassignempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentlist" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentlist" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignmentcommand" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignmentcommand" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentassignmentlistkey" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentassignmentlistkey" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="currentassignmentlistvalue" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentassignmentlistvalue" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getemptyparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getemptyparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="copyparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="copyparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -964,13 +964,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="checkparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ifparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="ifparameters" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -979,41 +979,41 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="commalistsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="commalistsize" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="getcommalistsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="getcommalistsize" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getcommacommandsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="getcommacommandsize" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfromcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfromcommalist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:resolve name="keyword-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfromcommacommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="getfromcommacommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
             <cd:resolve name="keyword-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstinlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstinlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogetcommacommandelement" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-number"/>
             <cd:delimiter name="from"/>
@@ -1023,14 +1023,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1038,7 +1038,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1047,7 +1047,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadrupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadrupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1057,7 +1057,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1068,7 +1068,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosixtupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosixtupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1080,7 +1080,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doseventupleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doseventupleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-optional"/>
@@ -1093,14 +1093,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosingleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosingleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1108,7 +1108,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1117,7 +1117,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadrupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadrupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1127,7 +1127,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1138,7 +1138,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosixtupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosixtupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1150,7 +1150,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doseventupleargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="doseventupleargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy"/>
@@ -1163,13 +1163,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strippedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="strippedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strippedcsname" variant="string" level="system" file="syst-aux.mkiv">
+    <cd:command name="strippedcsname" variant="string" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="none">
                 <cd:constant type="cd:text"/>
@@ -1177,13 +1177,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimple" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimple" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimple" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1192,13 +1192,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimpleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimpleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="complexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="complexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1207,13 +1207,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimple" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimple" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimple" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimple" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1222,13 +1222,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimpleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimpleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="cd:text"/>
@@ -1237,18 +1237,18 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="permitspacesbetweengroups" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="permitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dontpermitspacesbetweengroups" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="dontpermitspacesbetweengroups" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dosinglegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dosinglegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoublegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoublegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1256,7 +1256,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotriplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotriplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1265,7 +1265,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquadruplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquadruplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1275,7 +1275,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doquintuplegroupempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="doquintuplegroupempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dummy-optional"/>
@@ -1286,27 +1286,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofoneargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofoneargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoftwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoftwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoftwoarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoftwoarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1314,7 +1314,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1322,7 +1322,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofthreearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofthreearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1330,7 +1330,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1339,7 +1339,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1348,7 +1348,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1357,7 +1357,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthoffourarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthoffourarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1366,7 +1366,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1376,7 +1376,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1386,7 +1386,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1396,7 +1396,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1406,7 +1406,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fifthoffivearguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fifthoffivearguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1416,7 +1416,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1427,7 +1427,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1438,7 +1438,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1449,7 +1449,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fourthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fourthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1460,7 +1460,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fifthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="fifthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1471,7 +1471,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="sixthofsixarguments" level="system" file="syst-aux.mkiv">
+    <cd:command name="sixthofsixarguments" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1482,27 +1482,27 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofoneunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofoneunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstoftwounexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstoftwounexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondoftwounexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondoftwounexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="firstofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="firstofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1510,7 +1510,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="secondofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="secondofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1518,7 +1518,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="thirdofthreeunexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="thirdofthreeunexpanded" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dummy"/>
             <cd:resolve name="argument-dummy"/>
@@ -1526,56 +1526,56 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalletempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalletempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvalueempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvalueempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalueempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalueempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letvaluerelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="letvaluerelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letgvalurelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="letgvalurelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="relaxvalueifundefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="relaxvalueifundefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="rawgetparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="rawgetparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texdefinition" type="environment" level="system" file="syst-aux.mkiv">
+    <cd:command name="texdefinition" type="environment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="none" optional="yes">
                 <cd:constant type="spaces"/>
@@ -1613,39 +1613,39 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texdefinition" level="system" file="syst-aux.mkiv">
+    <cd:command name="texdefinition" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texcode" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="texcode" type="environment" level="system" category="catcode" file="syst-aux.mkiv"/>
 
-    <cd:command name="newcounter" level="system" file="syst-aux.mkiv">
+    <cd:command name="newcounter" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastincrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="fastincrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastdecrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="fastdecrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="increment" level="system" file="syst-aux.mkiv">
+    <cd:command name="increment" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="increment" variant="argument" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="parenthesis" list="yes">
                 <cd:constant type="cd:csname"/>
@@ -1654,13 +1654,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrement" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrement" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrement" variant="argument" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="parenthesis" list="yes">
                 <cd:constant type="cd:csname"/>
@@ -1669,49 +1669,43 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="incrementvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="incrementvalue" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="decrementvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="decrementvalue" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="newsignal" level="system" file="syst-aux.mkiv">
+    <cd:command name="newsignal" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkedstrippedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="checkedstrippedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkedstrippedcsname" variant="string" level="system" file="syst-aux.mkiv">
-        <cd:arguments>
-            <cd:resolve name="string-text"/>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="savenormalmeaning" level="system" file="syst-aux.mkiv">
+    <cd:command name="savenormalmeaning" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="recursedepth" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recursedepth" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="recurselevel" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recurselevel" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="resetrecurselevel" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resetrecurselevel" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dostepwiserecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="dostepwiserecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -1722,79 +1716,79 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dorecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="dorecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doexpandedrecurse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doexpandedrecurse" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowith" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowith" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command-list"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doloop" level="system" file="syst-aux.mkiv">
+    <cd:command name="doloop" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="exitloop" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="exitloop" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="exitloopnow" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="exitloopnow" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dofastloopcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="dofastloopcs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fastloopindex" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="fastloopindex" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="fastloopfinal" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="fastloopfinal" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="doloopoverlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="doloopoverlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="recursestring" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="recursestring" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="newevery" level="system" file="syst-aux.mkiv">
+    <cd:command name="newevery" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="EveryPar" level="system" file="syst-aux.mkiv">
+    <cd:command name="EveryPar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="EveryLine" level="system" file="syst-aux.mkiv">
+    <cd:command name="EveryLine" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forgeteverypar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="forgeteverypar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="convertvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
             <cd:delimiter name="to"/>
@@ -1802,14 +1796,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -1817,7 +1811,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifassignmentelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifassignmentelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -1825,13 +1819,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="docheckassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="docheckassignment" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ifassignment" level="system" file="syst-aux.mkiv">
+    <cd:command name="ifassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -1840,7 +1834,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseassignmentcs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseassignmentcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
@@ -1848,7 +1842,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifassignmentelsecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifassignmentelsecs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
@@ -1856,7 +1850,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="convertargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -1864,7 +1858,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="convertcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="convertcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:delimiter name="to"/>
@@ -1872,55 +1866,55 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="defconvertedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="defconvertedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="edefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="edefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gdefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="gdefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gdefconvertedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="gdefconvertedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xdefconvertedargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="xdefconvertedargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="showvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsemeaning" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsemeaning" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -1929,7 +1923,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifmeaningelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifmeaningelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
@@ -1938,7 +1932,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1947,7 +1941,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsamestringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsamestringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1956,7 +1950,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1964,7 +1958,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotsamestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotsamestring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -1972,7 +1966,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ConvertToConstant" level="system" file="syst-aux.mkiv">
+    <!-- begin of obsolete -->
+
+    <cd:command name="ConvertToConstant" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
@@ -1980,7 +1976,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ConvertConstantAfter" level="system" file="syst-aux.mkiv">
+    <cd:command name="ConvertConstantAfter" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
@@ -1988,61 +1984,63 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assignifempty" level="system" file="syst-aux.mkiv">
+    <!-- end of obsolete -->
+
+    <cd:command name="assignifempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="grabuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="grabuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processbetween" level="system" file="syst-aux.mkiv">
+    <cd:command name="processbetween" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbleuntilrelax" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbleuntilrelax" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-content"/>
             <cd:delimiter name="relax"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processuntil" level="system" file="syst-aux.mkiv">
+    <cd:command name="processuntil" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="groupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="groupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="simplegroupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="simplegroupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pickupgroupedcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="pickupgroupedcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2050,35 +2048,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="BeforePar" level="system" file="syst-aux.mkiv">
+    <cd:command name="BeforePar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="AfterPar" level="system" file="syst-aux.mkiv">
+    <cd:command name="AfterPar" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="GetPar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="GetPar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="GotoPar" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="GotoPar" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="dowithpargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithpargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithwargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithwargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dorepeatwithcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="dorepeatwithcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:text"/>
@@ -2088,7 +2086,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsestringinstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsestringinstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2097,7 +2095,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifstringinstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifstringinstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2106,7 +2104,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2114,7 +2112,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2122,7 +2120,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtoksonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtoksonce" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2130,7 +2128,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtoksonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtoksonce" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2138,7 +2136,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseintoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseintoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2147,7 +2145,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifintokselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifintokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-command"/>
             <cd:resolve name="argument-command"/>
@@ -2156,25 +2154,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="collecting" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="collecting" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="collect" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="collect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="expandedcollect" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="expandedcollect" type="environment" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="collect" level="system" file="syst-aux.mkiv">
+    <cd:command name="collect" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="collectexpanded" level="system" file="syst-aux.mkiv">
+    <cd:command name="collectexpanded" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="removetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="from"/>
@@ -2182,7 +2180,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2190,7 +2188,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependetoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependetoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-command"/>
             <cd:delimiter name="to"/>
@@ -2198,19 +2196,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushtoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="flushtoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotoks" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="beforesplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="beforesplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2220,7 +2218,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="aftersplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="aftersplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2230,7 +2228,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2242,7 +2240,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="greedysplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="greedysplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2254,7 +2252,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="beforetestandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="beforetestandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2264,7 +2262,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="aftertestandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="aftertestandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2274,7 +2272,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testandsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="testandsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="at"/>
@@ -2286,7 +2284,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatperiod" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatperiod" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2294,7 +2292,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcomma" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcomma" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2302,7 +2300,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatasterisk" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatasterisk" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2310,7 +2308,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcolon" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcolon" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2318,7 +2316,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitatcolons" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitatcolons" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:csname/>
@@ -2326,7 +2324,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removesubstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="removesubstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="from"/>
@@ -2336,35 +2334,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="addtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pretocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="pretocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustdoifelseinset" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -2373,7 +2371,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustdoifinsetelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -2382,35 +2380,35 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustaddtocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustaddtocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="robustpretocommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="robustpretocommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xsplitstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="xsplitstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="removefromcommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="removefromcommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="substituteincommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="substituteincommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text"/>
@@ -2418,14 +2416,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="replaceincommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="replaceincommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalprocesscommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalprocesscommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords>
                 <cd:constant type="cd:command"/>
@@ -2434,112 +2432,112 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="withoutpt" level="system" file="syst-aux.mkiv">
+    <cd:command name="withoutpt" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PtToCm" level="system" file="syst-aux.mkiv">
+    <cd:command name="PtToCm" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dimensiontocount" level="system" file="syst-aux.mkiv">
+    <cd:command name="dimensiontocount" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="numberofpoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="numberofpoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapdimens" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapdimens" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapcounts" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapcounts" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="swapmacros" level="system" file="syst-aux.mkiv">
+    <cd:command name="swapmacros" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapdimens" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapdimens" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapcounts" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapcounts" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalswapmacros" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalswapmacros" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalpushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="localpushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="globalpopmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="globalpopmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localpopmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="localpopmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="pushmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="pushmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="popmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="popmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="localhsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="localhsize" level="system" category="layout" file="syst-aux.mkiv"/>
 
-    <cd:command name="setlocalhsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="setlocalhsize" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="cd:dimension" prefix="cd:sign" method="none"/>
@@ -2547,9 +2545,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="availablehsize" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="availablehsize" level="system" category="layout" file="syst-aux.mkiv"/>
 
-    <cd:command name="distributedhsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="distributedhsize" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -2557,14 +2555,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="hsizefraction" level="system" file="syst-aux.mkiv">
+    <cd:command name="hsizefraction" level="system" category="layout" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvalue" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2572,7 +2570,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2580,7 +2578,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsevalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsevalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2589,7 +2587,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvalueelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
@@ -2598,21 +2596,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2620,7 +2618,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnothingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2628,7 +2626,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2636,7 +2634,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomethingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomethingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2644,21 +2642,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluesomething" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluesomething" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsevaluenothing" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsevaluenothing" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2666,7 +2664,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvaluenothingelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifvaluenothingelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2674,7 +2672,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2682,7 +2680,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvalueelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyvalueelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -2690,21 +2688,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotemptyvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotemptyvalue" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2713,7 +2711,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallcommonelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifallcommonelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2722,7 +2720,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2730,7 +2728,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotallcommon" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotallcommon" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -2738,7 +2736,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleemptywithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleemptywithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list-optional"/>
@@ -2746,7 +2744,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleemptywithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleemptywithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list-optional"/>
@@ -2755,7 +2753,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dodoubleargumentwithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dodoubleargumentwithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list"/>
@@ -2763,7 +2761,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dotripleargumentwithset" level="system" file="syst-aux.mkiv">
+    <cd:command name="dotripleargumentwithset" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="keyword-dummy-list"/>
@@ -2772,7 +2770,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="stripcharacter" level="system" file="syst-aux.mkiv">
+    <cd:command name="stripcharacter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-character"/>
             <cd:delimiter name="from"/>
@@ -2782,7 +2780,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="stripspaces" level="system" file="syst-aux.mkiv">
+    <cd:command name="stripspaces" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="from"/>
             <cd:resolve name="string-text"/>
@@ -2791,7 +2789,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspacestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspacestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2799,14 +2797,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="executeifdefined" level="system" file="syst-aux.mkiv">
+    <cd:command name="executeifdefined" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesomespace" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesomespace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2814,7 +2812,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsomespaceelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsomespaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -2822,7 +2820,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processseparatedlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processseparatedlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -2833,7 +2831,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-character"/>
             <cd:resolve name="argument-character"/>
@@ -2842,14 +2840,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processassignlist" level="system" file="syst-aux.mkiv">
+    <cd:command name="processassignlist" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text-list"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="untexargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="untexargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:delimiter name="to"/>
@@ -2857,7 +2855,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="untexcommand" level="system" file="syst-aux.mkiv">
+    <cd:command name="untexcommand" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-csname"/>
             <cd:delimiter name="to"/>
@@ -2865,56 +2863,56 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToWholeBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ScaledPointsToBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="ScaledPointsToBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ScaledPointsToWholeBigPoints" level="system" file="syst-aux.mkiv">
+    <cd:command name="ScaledPointsToWholeBigPoints" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="PointsToReal" level="system" file="syst-aux.mkiv">
+    <cd:command name="PointsToReal" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dontleavehmode" level="style" file="syst-aux.mkiv"/>
+    <cd:command name="dontleavehmode" level="style" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="utfupper" level="system" file="syst-aux.mkiv">
+    <cd:command name="utfupper" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="utflower" level="system" file="syst-aux.mkiv">
+    <cd:command name="utflower" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="uppercasestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="uppercasestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2922,7 +2920,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lowercasestring" level="system" file="syst-aux.mkiv">
+    <cd:command name="lowercasestring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2930,7 +2928,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="counttoken" level="system" file="syst-aux.mkiv">
+    <cd:command name="counttoken" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="in"/>
@@ -2940,7 +2938,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="counttokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="counttokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -2948,7 +2946,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="splitofftokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="splitofftokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="from"/>
@@ -2958,7 +2956,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="handletokens" level="system" file="syst-aux.mkiv">
+    <cd:command name="handletokens" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="with"/>
@@ -2966,11 +2964,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="settrialtypesetting" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="settrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="resettrialtypesetting" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resettrialtypesetting" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="iftrialtypesetting" level="system" file="syst-aux.mkiv">
+    <cd:command name="iftrialtypesetting" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-true"/>
             <cd:delimiter name="else"/>
@@ -2979,64 +2977,64 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="integerrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="integerrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="onedigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="onedigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="twodigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="twodigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="threedigitrounding" level="system" file="syst-aux.mkiv">
+    <cd:command name="threedigitrounding" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processcontent" level="system" file="syst-aux.mkiv">
+    <cd:command name="processcontent" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogobblesingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogobblesingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dogobbledoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="dogobbledoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblesingleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobblesingleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobbledoubleempty" level="system" file="syst-aux.mkiv">
+    <cd:command name="gobbledoubleempty" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dummy-optional"/>
             <cd:resolve name="keyword-dummy-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsesometoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsesometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
@@ -3044,7 +3042,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsometokselse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsometokselse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
@@ -3052,71 +3050,71 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifsometoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifsometoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptytoks" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifemptytoks" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strictinspectnextcharacter" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="strictinspectnextcharacter" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="strictdoifelsenextoptional" level="system" file="syst-aux.mkiv">
+    <cd:command name="strictdoifelsenextoptional" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="strictdoifnextoptionalelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="strictdoifnextoptionalelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-true"/>
             <cd:resolve name="argument-false"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gobblespacetokens" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="gobblespacetokens" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="verbatimstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="verbatimstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lastdigit" level="system" file="syst-aux.mkiv">
+    <cd:command name="lastdigit" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lasttwodigits" level="system" file="syst-aux.mkiv">
+    <cd:command name="lasttwodigits" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="serializedcommalist" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="serializedcommalist" level="system" category="strings" file="syst-aux.mkiv"/>
 
-    <cd:command name="serializecommalist" level="system" file="syst-aux.mkiv">
+    <cd:command name="serializecommalist" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-command-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="purenumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="purenumber" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filterfromvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="filterfromvalue" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -3124,7 +3122,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filterfromnext" level="system" file="syst-aux.mkiv">
+    <cd:command name="filterfromnext" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -3136,61 +3134,61 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definemeasure" level="style" file="syst-aux.mkiv">
+    <cd:command name="definemeasure" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="freezemeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="freezemeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setgmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setemeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setemeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxmeasure" level="system" file="syst-aux.mkiv">
+    <cd:command name="setxmeasure" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="measure" level="style" file="syst-aux.mkiv">
+    <cd:command name="measure" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="measured" level="style" file="syst-aux.mkiv">
+    <cd:command name="measured" level="style" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dividedsize" level="system" file="syst-aux.mkiv">
+    <cd:command name="dividedsize" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -3198,7 +3196,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedimension" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedimension" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3206,7 +3204,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdimensionelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdimensionelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3214,7 +3212,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedimenstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsedimenstring" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3222,7 +3220,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdimenstringelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifdimenstringelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3230,23 +3228,23 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="compresult" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="compresult" level="system" category="counter" file="syst-aux.mkiv"/>
 
-    <cd:command name="comparedimension" level="system" file="syst-aux.mkiv">
+    <cd:command name="comparedimension" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="comparedimensioneps" level="system" file="syst-aux.mkiv">
+    <cd:command name="comparedimensioneps" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcscsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcscsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:delimiter name="csname"/>
@@ -3255,7 +3253,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcsnamecs" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcsnamecs" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="csname"/>
             <cd:resolve name="string-name"/>
@@ -3264,7 +3262,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="letcsnamecsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="letcsnamecsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:delimiter name="csname"/>
             <cd:resolve name="string-name"/>
@@ -3275,20 +3273,20 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="addvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="addvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaced" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaced" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaceargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaceargument" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-text"/>
             <cd:delimiter name="to"/>
@@ -3296,14 +3294,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unspaceafter" level="system" file="syst-aux.mkiv">
+    <cd:command name="unspaceafter" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsehasspace" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsehasspace" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3311,7 +3309,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifhasspaceelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifhasspaceelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-true"/>
@@ -3319,25 +3317,25 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setflag" level="system" file="syst-aux.mkiv">
+    <cd:command name="setflag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetflag" level="system" file="syst-aux.mkiv">
+    <cd:command name="resetflag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flag" level="system" file="syst-aux.mkiv">
+    <cd:command name="flag" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseflagged" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelseflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -3345,7 +3343,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifflaggedelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifflaggedelse" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -3353,14 +3351,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotflagged" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnotflagged" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inheritparameter" level="system" file="syst-aux.mkiv">
+    <cd:command name="inheritparameter" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="keyword-text"/>
@@ -3368,7 +3366,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsenonzeropositive" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifelsenonzeropositive" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -3376,7 +3374,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnonzeropositiveelse" level="system" file="syst-aux.mkiv">
+    <cd:command name="doifnonzeropositiveelse" level="system" category="strings" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -3384,122 +3382,122 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getraweparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getraweparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawgparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawgparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getrawxparameters" level="system" file="syst-aux.mkiv">
+    <cd:command name="getrawxparameters" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-text"/>
             <cd:resolve name="assignment-userdata-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="unprotected" level="system" file="syst-aux.mkiv">
+    <cd:command name="unprotected" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="string-content"/>
             <cd:delimiter name="par"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resettimer" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="resettimer" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedtime" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedtime" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedseconds" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedseconds" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="elapsedsteptime" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="elapsedsteptime" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="currentfeaturetest" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="currentfeaturetest" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="testfeature" level="system" file="syst-aux.mkiv">
+    <cd:command name="testfeature" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="retestfeature" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="retestfeature" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="showtimer" level="system" file="syst-aux.mkiv">
+    <cd:command name="showtimer" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testfeatureonce" level="system" file="syst-aux.mkiv">
+    <cd:command name="testfeatureonce" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="freezedimenmacro" level="system" file="syst-aux.mkiv">
+    <cd:command name="freezedimenmacro" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="negated" level="system" file="syst-aux.mkiv">
+    <cd:command name="negated" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="assigndimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="assigndimen" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="appendgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="appendgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="prependgvalue" level="system" file="syst-aux.mkiv">
+    <cd:command name="prependgvalue" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processranges" level="system" file="syst-aux.mkiv">
+    <cd:command name="processranges" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords list="yes">
                 <cd:constant type="cd:number"/>
@@ -3509,7 +3507,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dowithrange" level="system" file="syst-aux.mkiv">
+    <cd:command name="dowithrange" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces" list="yes">
                 <cd:constant type="cd:number"/>
@@ -3519,11 +3517,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ignoreimplicitspaces" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="ignoreimplicitspaces" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="nointerference" type="environment" level="system" file="syst-aux.mkiv"/>
+    <cd:command name="nointerference" type="environment" level="system" category="system" file="syst-aux.mkiv"/>
 
-    <cd:command name="expandcheckedcsname" level="system" file="syst-aux.mkiv">
+    <cd:command name="expandcheckedcsname" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-key"/>
@@ -3531,43 +3529,43 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="docheckedpair" level="system" file="syst-aux.mkiv">
+    <cd:command name="docheckedpair" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantnumber" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantnumber" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantnumberargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantnumberargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantdimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantdimen" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantdimenargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantdimenargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="constantemptyargument" level="system" file="syst-aux.mkiv">
+    <cd:command name="constantemptyargument" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getsubstring" level="system" file="syst-aux.mkiv">
+    <cd:command name="getsubstring" level="system" category="strings" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -3575,7 +3573,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="converteddimen" level="system" file="syst-aux.mkiv">
+    <cd:command name="converteddimen" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:keywords delimiters="braces">
@@ -3595,14 +3593,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ntimes" level="system" file="syst-aux.mkiv">
+    <cd:command name="ntimes" level="system" category="system" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3611,7 +3609,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoif" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3619,7 +3617,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifnot" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3627,7 +3625,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoif" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoif" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3635,7 +3633,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoifnot" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoifnot" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3643,7 +3641,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expandeddoifelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expandeddoifelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
             <cd:content/>
@@ -3652,7 +3650,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelsecommon" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -3661,7 +3659,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifcommonelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifcommonelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text-list"/>
             <cd:resolve name="argument-text-list"/>
@@ -3670,7 +3668,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifelseinset" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifelseinset" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -3679,7 +3677,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="expdoifinsetelse" level="system" file="syst-lua.mkiv">
+    <cd:command name="expdoifinsetelse" level="system" category="strings" keywords="conditional" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:resolve name="argument-text-list"/>
@@ -3688,13 +3686,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="luaexpr" level="system" file="syst-lua.mkiv">
+    <cd:command name="luaexpr" level="system" category="strings" file="syst-lua.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupsystem" level="style" file="core-sys.mkiv">
+    <cd:command name="setupsystem" level="style" category="counter" file="core-sys.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="n">
diff --git a/tex/context/interface/mkiv/i-systemlog.xml b/tex/context/interface/mkiv/i-systemlog.xml
index 93717af21..16b121322 100644
--- a/tex/context/interface/mkiv/i-systemlog.xml
+++ b/tex/context/interface/mkiv/i-systemlog.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="systemlog" level="system" file="core-sys.mkiv">
+    <cd:command name="systemlog" level="system" category="tracker" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-text"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="systemlogfirst" level="system" file="core-sys.mkiv">
+    <cd:command name="systemlogfirst" level="system" category="tracker" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-text"/>
@@ -20,7 +20,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="systemloglast" level="system" file="core-sys.mkiv">
+    <cd:command name="systemloglast" level="system" category="tracker" file="core-sys.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml
index d07b32ec1..4193f0e24 100644
--- a/tex/context/interface/mkiv/i-tagging.xml
+++ b/tex/context/interface/mkiv/i-tagging.xml
@@ -32,7 +32,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseinelement" level="system" category="xml conditional" file="strc-tag.mkiv">
+    <cd:command name="doifelseinelement" level="system" category="xml" keywords="conditional" file="strc-tag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -40,7 +40,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifinelementelse" level="system" category="xml conditional" file="strc-tag.mkiv">
+    <cd:command name="doifinelementelse" level="system" category="xml" keywords="conditional" file="strc-tag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -48,7 +48,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="taggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv">
+    <cd:command name="taggedlabeltexts" level="system" category="xml" keywords="language" file="strc-tag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -56,7 +56,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="namedtaggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv">
+    <cd:command name="namedtaggedlabeltexts" level="system" category="xml" keywords="language" file="strc-tag.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml
index b532b10f9..71234373f 100644
--- a/tex/context/interface/mkiv/i-textflow.xml
+++ b/tex/context/interface/mkiv/i-textflow.xml
@@ -37,7 +37,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsetextflowcollector" level="system" category="structure conditional" file="page-flw.mkiv">
+    <cd:command name="doifelsetextflowcollector" level="system" category="structure" keywords="conditional" file="page-flw.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -45,7 +45,7 @@
         </cd:arguments>
     </cd:command>
     
-    <cd:command name="doiftextflowcollectorelse" level="system" category="structure conditional" file="page-flw.mkiv">
+    <cd:command name="doiftextflowcollectorelse" level="system" category="structure" keywords="conditional" file="page-flw.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -53,7 +53,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsetextflow" level="system" category="structure conditional" file="page-flw.mkiv">
+    <cd:command name="doifelsetextflow" level="system" category="structure" keywords="conditional" file="page-flw.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -61,7 +61,7 @@
         </cd:arguments>
     </cd:command>
     
-    <cd:command name="doiftextflowelse" level="system" category="structure conditional" file="page-flw.mkiv">
+    <cd:command name="doiftextflowelse" level="system" category="structure" keywords="conditional" file="page-flw.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml
index 18f40911c..0dcaf065d 100644
--- a/tex/context/interface/mkiv/i-texts.xml
+++ b/tex/context/interface/mkiv/i-texts.xml
@@ -134,7 +134,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselayouttextline" level="system" category="layout conditional" file="page-txt.mkvi">
+    <cd:command name="doifelselayouttextline" level="system" category="layout" keywords="conditional" file="page-txt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -142,7 +142,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflayouttextlineelse" level="system" category="layout conditional" file="page-txt.mkvi">
+    <cd:command name="doiflayouttextlineelse" level="system" category="layout" keywords="conditional" file="page-txt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -150,7 +150,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelselayoutsomeline" level="system" category="layout conditional" file="page-txt.mkvi">
+    <cd:command name="doifelselayoutsomeline" level="system" category="layout" keywords="conditional" file="page-txt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -158,7 +158,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiflayoutsomelineelse" level="system" category="layout conditional" file="page-txt.mkvi">
+    <cd:command name="doiflayoutsomelineelse" level="system" category="layout" keywords="conditional" file="page-txt.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml
index 8d9ced890..f0359587b 100644
--- a/tex/context/interface/mkiv/i-token.xml
+++ b/tex/context/interface/mkiv/i-token.xml
@@ -4,55 +4,55 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="tokens" type="environment" level="system" file="toks-tra.mkiv">
+    <cd:command name="tokens" type="environment" level="system" category="strings" file="toks-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="flushtokens" level="system" file="toks-tra.mkiv">
+    <cd:command name="flushtokens" level="system" category="strings" file="toks-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showtokens" level="system" file="toks-tra.mkiv">
+    <cd:command name="showtokens" level="system" category="strings" file="toks-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="testtokens" level="system" file="toks-tra.mkiv">
+    <cd:command name="testtokens" level="system" category="strings" file="toks-tra.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definetokenlist" level="style" file="toks-aux.mkiv">
+    <cd:command name="definetokenlist" level="style" category="strings" file="toks-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="tokenlist" type="environment" level="style" file="toks-aux.mkiv">
+    <cd:command name="tokenlist" type="environment" level="style" category="strings" file="toks-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gettokenlist" level="style" file="toks-aux.mkiv">
+    <cd:command name="gettokenlist" level="style" category="strings" file="toks-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resettokenlist" level="style" file="toks-aux.mkiv">
+    <cd:command name="resettokenlist" level="style" category="strings" file="toks-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="settokenlist" level="style" file="toks-aux.mkiv">
+    <cd:command name="settokenlist" level="style" category="strings" file="toks-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml
index 579de59fb..785674e2c 100644
--- a/tex/context/interface/mkiv/i-tracker.xml
+++ b/tex/context/interface/mkiv/i-tracker.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="installtextracker" level="system" file="trac-ctx.mkiv">
+    <cd:command name="installtextracker" level="system" category="tracker" file="trac-ctx.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="installtexdirective" level="system" file="trac-ctx.mkiv">
+    <cd:command name="installtexdirective" level="system" category="tracker" file="trac-ctx.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-command"/>
@@ -20,56 +20,56 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="enabletrackers" level="style" file="trac-deb.mkiv">
+    <cd:command name="enabletrackers" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="disabletrackers" level="style" file="trac-deb.mkiv">
+    <cd:command name="disabletrackers" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resettrackers" level="system" file="trac-deb.mkiv"/>
+    <cd:command name="resettrackers" level="system" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="showtrackers" level="document" file="trac-deb.mkiv"/>
+    <cd:command name="showtrackers" level="document" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="enabledirectives" level="style" file="trac-deb.mkiv">
+    <cd:command name="enabledirectives" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="disabledirectives" level="style" file="trac-deb.mkiv">
+    <cd:command name="disabledirectives" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showdirectives" level="document" file="trac-deb.mkiv"/>
+    <cd:command name="showdirectives" level="document" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="enableexperiments" level="style" file="trac-deb.mkiv">
+    <cd:command name="enableexperiments" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="disableexperiments" level="style" file="trac-deb.mkiv">
+    <cd:command name="disableexperiments" level="style" category="tracker" file="trac-deb.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-list"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showexperiments" level="document" file="trac-deb.mkiv"/>
+    <cd:command name="showexperiments" level="document" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="showedebuginfo" level="system" file="trac-deb.mkiv"/>
+    <cd:command name="showedebuginfo" level="system" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="overloaderror" level="system" file="trac-deb.mkiv"/>
+    <cd:command name="overloaderror" level="system" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="showlogcategories" level="system" file="trac-deb.mkiv"/>
+    <cd:command name="showlogcategories" level="system" category="tracker" file="trac-deb.mkiv"/>
 
-    <cd:command name="showjustification" level="system" file="trac-jus.mkiv"/>
+    <cd:command name="showjustification" level="system" category="tracker" file="trac-jus.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml
index 63783d040..853e21d1f 100644
--- a/tex/context/interface/mkiv/i-twopassdata.xml
+++ b/tex/context/interface/mkiv/i-twopassdata.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="immediatesavetwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="immediatesavetwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="savetwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="savetwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -20,7 +20,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lazysavetwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="lazysavetwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -28,7 +28,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="savetaggedtwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="savetaggedtwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -37,7 +37,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="lazysavetaggedtwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="lazysavetaggedtwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-number"/>
@@ -46,57 +46,57 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definetwopasslist" level="system" file="core-two.mkiv">
+    <cd:command name="definetwopasslist" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gettwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="gettwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checktwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="checktwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="findtwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="findtwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfirsttwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="getfirsttwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getlasttwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="getlasttwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getnamedtwopassdatalist" level="system" file="core-two.mkiv">
+    <cd:command name="getnamedtwopassdatalist" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:csname/>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="gettwopassdatalist" level="system" file="core-two.mkiv">
+    <cd:command name="gettwopassdatalist" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseintwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="doifelseintwopassdata" level="system" category="twopassdata" keywords="conditional" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -105,7 +105,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifintwopassdataelse" level="system" file="core-two.mkiv">
+    <cd:command name="doifintwopassdataelse" level="system" category="twopassdata" keywords="conditional" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
@@ -114,7 +114,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getfromtwopassdata" level="system" file="core-two.mkiv">
+    <cd:command name="getfromtwopassdata" level="system" category="twopassdata" file="core-two.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-name"/>
diff --git a/tex/context/interface/mkiv/i-userdata.xml b/tex/context/interface/mkiv/i-userdata.xml
index e9617f0bc..6c7da128a 100644
--- a/tex/context/interface/mkiv/i-userdata.xml
+++ b/tex/context/interface/mkiv/i-userdata.xml
@@ -47,7 +47,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="userdata" type="environment" level="document" category="structure" file="strc-usr.mkiv">
+    <cd:command name="userdata" type="environment" level="document" category="structure" keywords="buffer" file="strc-usr.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="assignment-userdata-list-optional"/>
@@ -78,8 +78,8 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getuserdata" level="style" category="structure" file="strc-usr.mkiv"/>
+    <cd:command name="getuserdata" level="style" category="structure" keywords="buffer" file="strc-usr.mkiv"/>
 
-    <cd:command name="getinlineuserdata" level="style" category="structure" file="strc-usr.mkiv"/>
+    <cd:command name="getinlineuserdata" level="style" category="structure" keywords="buffer" file="strc-usr.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml
index 12855e36f..69aab736e 100644
--- a/tex/context/interface/mkiv/i-variables.xml
+++ b/tex/context/interface/mkiv/i-variables.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setvariables" level="style" file="core-env.mkiv">
+    <cd:command name="setvariables" level="style" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -21,7 +21,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setevariables" level="system" file="core-env.mkiv">
+    <cd:command name="setevariables" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -38,7 +38,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgvariables" level="system" file="core-env.mkiv">
+    <cd:command name="setgvariables" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -55,7 +55,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxvariables" level="system" file="core-env.mkiv">
+    <cd:command name="setxvariables" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -72,7 +72,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="checkvariables" level="system" file="core-env.mkiv">
+    <cd:command name="checkvariables" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:assignments list="yes">
@@ -89,7 +89,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setvariable" level="style" file="core-env.mkiv">
+    <cd:command name="setvariable" level="style" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -97,7 +97,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setevariable" level="system" file="core-env.mkiv">
+    <cd:command name="setevariable" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -105,7 +105,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setgvariable" level="system" file="core-env.mkiv">
+    <cd:command name="setgvariable" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -113,7 +113,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setxvariable" level="system" file="core-env.mkiv">
+    <cd:command name="setxvariable" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -121,21 +121,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getvariable" level="style" file="core-env.mkiv">
+    <cd:command name="getvariable" level="style" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showvariable" level="system" file="core-env.mkiv">
+    <cd:command name="showvariable" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsevariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifelsevariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -144,7 +144,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvariableelse" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifvariableelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -153,7 +153,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifvariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -161,7 +161,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotvariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifnotvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -169,7 +169,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseemptyvariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifelseemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -178,7 +178,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvariableelse" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifemptyvariableelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -187,7 +187,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifemptyvariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -195,7 +195,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotemptyvariable" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifnotemptyvariable" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -203,7 +203,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getvariabledefault" level="system" file="core-env.mkiv">
+    <cd:command name="getvariabledefault" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-key"/>
@@ -211,7 +211,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupenv" level="system" file="core-env.mkiv">
+    <cd:command name="setupenv" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:assignments list="yes">
                 <cd:parameter name="set">
@@ -227,7 +227,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseenv" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifelseenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
@@ -235,7 +235,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifenvelse" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifenvelse" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
@@ -243,74 +243,74 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifenv" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotenv" level="system" category="conditional" file="core-env.mkiv">
+    <cd:command name="doifnotenv" level="system" category="strings" keywords="conditional" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="env" level="system" file="core-env.mkiv">
+    <cd:command name="env" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="envvar" level="system" file="core-env.mkiv">
+    <cd:command name="envvar" level="system" category="strings" file="core-env.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-key"/>
             <cd:resolve name="argument-command"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setdocumentfilename" level="system" file="luat-ini.mkiv">
+    <cd:command name="setdocumentfilename" category="strings" level="system" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setdocumentargument" level="system" file="luat-ini.mkiv">
+    <cd:command name="setdocumentargument" category="strings" level="system" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setdocumentargumentdefault" level="system" file="luat-ini.mkiv">
+    <cd:command name="setdocumentargumentdefault" category="strings" level="system" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getdocumentfilename" level="system" file="luat-ini.mkiv">
+    <cd:command name="getdocumentfilename" level="system" category="strings" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getdocumentargument" level="system" file="luat-ini.mkiv">
+    <cd:command name="getdocumentargument" level="system" category="strings" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="getdocumentargumentdefault" level="system" file="luat-ini.mkiv">
+    <cd:command name="getdocumentargumentdefault" level="system" category="strings" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-text"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedocumentargument" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifelsedocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -318,7 +318,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdocumentargumentelse" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifdocumentargumentelse" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
@@ -326,21 +326,21 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdocumentargument" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifdocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotdocumentargument" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifnotdocumentargument" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsedocumentfilename" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifelsedocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -348,7 +348,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdocumentfilenameelse" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifdocumentfilenameelse" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -356,14 +356,14 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifdocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifnotdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv">
+    <cd:command name="doifnotdocumentfilename" level="system" category="strings" keywords="conditional" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml
index f81665cc1..eaeeaac1a 100644
--- a/tex/context/interface/mkiv/i-verbatim.xml
+++ b/tex/context/interface/mkiv/i-verbatim.xml
@@ -235,7 +235,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" file="buff-ver.mkiv">
+    <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" keywords="buffer" file="buff-ver.mkiv">
         <cd:sequence>
             <cd:instance value="typing"/>
         </cd:sequence>
@@ -249,7 +249,7 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" file="buff-ver.mkiv">
+    <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" keywords="buffer" file="buff-ver.mkiv">
         <cd:sequence>
             <cd:instance value="typing"/>
         </cd:sequence>
@@ -321,7 +321,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelsetypingfile" category="verbatim conditional" level="system" file="buff-ver.mkiv">
+    <cd:command name="doifelsetypingfile" level="system" category="verbatim" keywords="conditional" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
@@ -329,7 +329,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doiftypingfileelse" category="verbatim conditional" level="system" file="buff-ver.mkiv">
+    <cd:command name="doiftypingfileelse" level="system" category="verbatim" keywords="conditional" file="buff-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-file"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml
index 1e6e46d58..643d17215 100644
--- a/tex/context/interface/mkiv/i-version.xml
+++ b/tex/context/interface/mkiv/i-version.xml
@@ -41,7 +41,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseolderversion" level="system" category="conditional" file="file-mod.mkvi">
+    <cd:command name="doifelseolderversion" level="system" keywords="conditional" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -50,7 +50,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifolderversionelse" level="system" category="conditional" file="file-mod.mkvi">
+    <cd:command name="doifolderversionelse" level="system" keywords="conditional" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-number"/>
@@ -59,7 +59,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifelseoldercontext" level="system" category="conditional" file="file-mod.mkvi">
+    <cd:command name="doifelseoldercontext" level="system" keywords="conditional" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
@@ -67,7 +67,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doifoldercontextelse" level="system" category="conditional" file="file-mod.mkvi">
+    <cd:command name="doifoldercontextelse" level="system" keywords="conditional" file="file-mod.mkvi">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:resolve name="argument-true"/>
diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml
index dc9e96ec3..6679fd410 100644
--- a/tex/context/interface/mkiv/i-visual.xml
+++ b/tex/context/interface/mkiv/i-visual.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="fakerule" level="system" file="m-visual.mkiv">
+    <cd:command name="fakerule" level="system" category="rules" file="m-visual.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
         </cd:arguments>
@@ -17,7 +17,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakelines" level="document" file="m-visual.mkiv">
+    <cd:command name="fakelines" level="document" category="strings" file="m-visual.mkiv">
         <cd:arguments>
             <cd:keywords name="keywords" delimiters="braces">
                 <cd:constant type="cd:number"/>
@@ -30,7 +30,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakewords" level="document" file="m-visual.mkiv">
+    <cd:command name="fakewords" level="document" category="strings" file="m-visual.mkiv">
         <cd:arguments>
             <cd:keywords name="keywords" delimiters="braces">
                 <cd:constant type="cd:number"/>
@@ -43,7 +43,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakenwords" level="system" file="m-visual.mkiv">
+    <cd:command name="fakenwords" level="system" category="strings" file="m-visual.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
             <cd:keywords name="keywords" delimiters="braces">
@@ -53,19 +53,19 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showfakewords" level="system" file="m-visual.mkiv"/>
+    <cd:command name="showfakewords" level="system" category="strings" file="m-visual.mkiv"/>
 
-    <cd:command name="fakeword" level="system" file="m-visual.mkiv"/>
+    <cd:command name="fakeword" level="system" category="strings" file="m-visual.mkiv"/>
 
-    <cd:command name="fakeparindent" level="system" file="m-visual.mkiv"/>
+    <cd:command name="fakeparindent" level="system" category="whitespace" file="m-visual.mkiv"/>
 
-    <cd:command name="fakeddroppedcaps" level="system" file="m-visual.mkiv">
+    <cd:command name="fakeddroppedcaps" level="system" category="fonts" file="m-visual.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakefigure" level="document" file="m-visual.mkiv">
+    <cd:command name="fakefigure" level="document" category="graphics" keywords="structure" file="m-visual.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="placefloat"/>
@@ -78,7 +78,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakeimage" level="document" file="m-visual.mkiv">
+    <cd:command name="fakeimage" level="document" category="graphics" file="m-visual.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-dimension"/>
             <cd:resolve name="argument-dimension"/>
@@ -87,11 +87,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="fakeformula" level="document" file="m-visual.mkiv"/>
+    <cd:command name="fakeformula" level="document" category="mathematics" file="m-visual.mkiv"/>
 
-    <cd:command name="fakespacingformula" level="document" file="m-visual.mkiv"/>
+    <cd:command name="fakespacingformula" level="document" category="mathematics" file="m-visual.mkiv"/>
 
-    <cd:command name="smashedgrid" level="system" file="m-visual.mkiv">
+    <cd:command name="smashedgrid" level="system" category="layout" file="m-visual.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="basegrid"/>
@@ -99,17 +99,17 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="bodyfontgrid" level="system" file="m-visual.mkiv"/>
+    <cd:command name="bodyfontgrid" level="system" category="fonts" file="m-visual.mkiv"/>
 
-    <cd:command name="emexgrid" level="system" file="m-visual.mkiv"/>
+    <cd:command name="emexgrid" level="system" category="fonts" file="m-visual.mkiv"/>
 
-    <cd:command name="simplethesis" level="system" file="m-visual.mkiv"/>
+    <cd:command name="simplethesis" level="system" category="layout" file="m-visual.mkiv"/>
 
-    <cd:command name="showbaselines" level="system" file="m-visual.mkiv"/>
+    <cd:command name="showbaselines" level="system" category="layout" file="m-visual.mkiv"/>
 
-    <cd:command name="showpagebuilder" level="system" file="m-visual.mkiv"/>
+    <cd:command name="showpagebuilder" level="system" category="layout" file="m-visual.mkiv"/>
 
-    <cd:command name="tagbox" level="system" file="m-visual.mkiv">
+    <cd:command name="tagbox" level="system" category="boxes" file="m-visual.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
             <cd:keywords optional="yes">
@@ -131,24 +131,24 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="coloredhbox" level="system" file="m-visual.mkiv">
+    <cd:command name="coloredhbox" level="system" category="boxes" keywords="colors" file="m-visual.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="coloredvbox" level="system" file="m-visual.mkiv">
+    <cd:command name="coloredvbox" level="system" category="boxes" keywords="colors" file="m-visual.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="coloredvtop" level="system" file="m-visual.mkiv">
+    <cd:command name="coloredvtop" level="system" category="boxes" keywords="colors" file="m-visual.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="coloredstrut" level="system" file="m-visual.mkiv"/>
+    <cd:command name="coloredstrut" level="system" category="fonts" file="m-visual.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml
index 81d02f4fb..817cdb383 100644
--- a/tex/context/interface/mkiv/i-visualizer.xml
+++ b/tex/context/interface/mkiv/i-visualizer.xml
@@ -4,111 +4,111 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="ruledhbox" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledhbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledvbox" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledvbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledvtop" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledvtop" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledtopv" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledtopv" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledhpack" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledhpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledvpack" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledvpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledtpack" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledtpack" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="ruledmbox" level="system" file="trac-vis.mkiv">
+    <cd:command name="ruledmbox" level="system" category="boxes" keywords="rules" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxr" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxr" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxg" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxg" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxb" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxb" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxc" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxc" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxm" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxm" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxy" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxy" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="filledhboxk" level="system" file="trac-vis.mkiv">
+    <cd:command name="filledhboxk" level="system" category="boxes" keywords="background colors" file="trac-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="string-boxoptions"/>
             <cd:content/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showmakeup" level="document" file="trc-vis.mkiv">
+    <cd:command name="showmakeup" level="document" category="boxes" file="trc-vis.mkiv">
         <cd:arguments>
             <cd:keywords optional="yes">
                 <cd:constant type="makeup" default="yes"/>
@@ -142,26 +142,26 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="showallmakeup" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showallmakeup" level="document" category="boxes" file="trc-vis.mkiv"/>
 
-    <cd:command name="showboxes" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showboxes" level="document" category="boxes" file="trc-vis.mkiv"/>
 
-    <cd:command name="showglyphs" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showglyphs" level="document" category="fonts" file="trc-vis.mkiv"/>
 
-    <cd:command name="showfontkerns" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showfontkerns" level="document" category="fonts" file="trc-vis.mkiv"/>
 
-    <cd:command name="showfontitalics" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showfontitalics" level="document" category="fonts" file="trc-vis.mkiv"/>
 
-    <cd:command name="showglyphdata" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showglyphdata" level="document" category="fonts" file="trc-vis.mkiv"/>
 
-    <cd:command name="showfontexpansion" level="document" file="trc-vis.mkiv"/>
+    <cd:command name="showfontexpansion" level="document" category="fonts" file="trc-vis.mkiv"/>
 
-    <cd:command name="setvisualizerfont" level="system" file="trc-vis.mkiv">
+    <cd:command name="setvisualizerfont" level="system" category="fonts" file="trc-vis.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-font-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="resetvisualizers" level="system" file="trc-vis.mkiv"/>
+    <cd:command name="resetvisualizers" level="system" category="fonts" file="trc-vis.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml
index 0f3e0bdcc..c64b44a41 100644
--- a/tex/context/interface/mkiv/i-whitespace.xml
+++ b/tex/context/interface/mkiv/i-whitespace.xml
@@ -59,6 +59,6 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="forgetparskip" category="alignment" level="system" file="spac-ver.mkiv"/>
+    <cd:command name="forgetparskip" category="alignment" keywords="alignment" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml
index e460aa22a..d911b58c5 100644
--- a/tex/context/interface/mkiv/i-xml.xml
+++ b/tex/context/interface/mkiv/i-xml.xml
@@ -827,7 +827,7 @@
 
     <!--
 
-        <cd:command name="xmltoparameters" file="lxml-ini.mkiv">
+        <cd:command name="xmltoparameters" level="style" category="xml" file="lxml-ini.mkiv">
             <cd:arguments>
             <cd:resolve name="argument-node"/>
             <cd:resolve name="argument-lpath"/>
@@ -935,4 +935,10 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="xmldepth" level="style" category="xml" file="lxml-ini.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-node"/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml
index 7ee0df3f2..4e1056cb2 100644
--- a/tex/context/interface/mkiv/i-xtable.xml
+++ b/tex/context/interface/mkiv/i-xtable.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definextable" level="style" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="definextable" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
@@ -14,7 +14,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupxtable" level="style" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="setupxtable" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
@@ -101,7 +101,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtable" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtable" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -109,13 +109,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="embeddedxtable" type="environment" level="style" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="embeddedxtable" type="environment" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -123,13 +123,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:sequence>
             <cd:variable value="xtable"/>
         </cd:sequence>
@@ -140,13 +140,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="processxtablebuffer" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="processxtablebuffer" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xrow" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xrow" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -157,7 +157,7 @@
 
     <!--
 
-        <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+        <cd:command name="xcolumn" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
             <cd:arguments>
                 <cd:resolve name="keyword-name-optional"/>
                 <cd:assignments list="yes" optional="yes">
@@ -168,7 +168,7 @@
 
     -->
 
-    <cd:command name="xcolumn" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xcolumn" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -176,13 +176,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xcolumn" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xcolumn" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xcell" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xcell" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -203,7 +203,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablehead" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablehead" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -211,13 +211,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablefoot" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablefoot" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -225,13 +225,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablenext" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablenext" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -239,13 +239,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablebody" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablebody" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupxtable"/>
@@ -253,13 +253,13 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -268,7 +268,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xrowgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xrowgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -277,7 +277,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="xcellgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi">
+    <cd:command name="xcellgroup" type="environment" level="document" category="tables" keywords="background rules" file="tabl-xtb.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
@@ -286,8 +286,8 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="currentxtablerow" level="system" category="tables" file="tabl-xtb.mkvi"/>
+    <cd:command name="currentxtablerow" level="system" category="tables" keywords="background rules" file="tabl-xtb.mkvi"/>
 
-    <cd:command name="currentxtablecolumn" level="system" category="tables" file="tabl-xtb.mkvi"/>
+    <cd:command name="currentxtablecolumn" level="system" category="tables" keywords="background rules" file="tabl-xtb.mkvi"/>
 
 </cd:interface>
diff --git a/tex/context/base/mkiv/toks-tra.lua b/tex/context/modules/common/s-obsolete-tokens.mkiv
index 3a5bc1306..81467fc6f 100644
--- a/tex/context/base/mkiv/toks-tra.lua
+++ b/tex/context/modules/common/s-obsolete-tokens.mkiv
@@ -1,12 +1,34 @@
-if not modules then modules = { } end modules ['toks-ini'] = {
+%D \module
+%D   [       file=toks-tra, % was toks-ini
+%D        version=2007.03.03,
+%D          title=\CONTEXT\ Obsolete Modules,
+%D       subtitle=Tokens,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D The code here used to be in the \type {toks-tra} files which were made in
+%D the real early days of \LUATEX\ and used in articles and presentations
+%D about this engine. Because the code is used in manuals we keep it around
+%D as module.
+
+\writestatus{loading}{ConTeXt Obsolete Modules / Tokens}
+
+%D This used to be in \type {toks-tra.lua}:
+
+\startluacode
+
+if not modules then modules = { } end modules ['s-obsolete-tokens'] = {
     version   = 1.001,
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
     license   = "see context related readme files"
 }
 
--- this will become a module
-
 local utfbyte, utfchar, utfvalues = utf.byte, utf.char, utf.values
 local format, gsub = string.format, string.gsub
 local tostring = tostring
@@ -69,27 +91,34 @@ function collectors.show(data)
     local ctx_NR       = context.NR
     local ctx_bold     = context.bold
     local ctx_verbatim = context.verbatim
-    context.starttabulate { "|Tl|Tc|Tl|" }
-    ctx_NC() ctx_bold("cmd")
-    ctx_NC() ctx_bold("meaning")
-    ctx_NC() ctx_bold("properties")
-    ctx_NC() ctx_NR()
-    context.HL()
-    for i=1,#data do
-        local token   = data[i]
-        local cmdname = token.cmdname
-        local simple  = simple[cmdname]
-        ctx_NC()
-        ctx_verbatim(simple or cmdname)
-        ctx_NC()
-        ctx_verbatim(simple and utfchar(token.mode) or token.csname)
-        ctx_NC()
-        if token.active     then context("active ") end
-        if token.expandable then context("expandable ") end
-        if token.protected  then context("protected ") end
-        ctx_NC()
-        ctx_NR()
+    local function show(data)
+        for i=1,#data do
+            local token = data[i]
+            if type(token) == "table" then
+                show(token)
+            else
+                local cmdname = token.cmdname
+                local simple  = simple[cmdname]
+                ctx_NC()
+                ctx_verbatim(simple or cmdname)
+                ctx_NC()
+                ctx_verbatim(simple and utfchar(token.index) or token.csname)
+                ctx_NC()
+                if token.active     then context("active ") end
+                if token.expandable then context("expandable ") end
+                if token.protected  then context("protected ") end
+                ctx_NC()
+                ctx_NR()
+            end
+        end
     end
+    context.starttabulate { "|Tl|Tc|Tl|" }
+        ctx_NC() ctx_bold("cmd")
+        ctx_NC() ctx_bold("meaning")
+        ctx_NC() ctx_bold("properties")
+        ctx_NC() ctx_NR()
+        context.HL()
+        show(data)
     context.stoptabulate()
 end
 
@@ -291,3 +320,27 @@ function collectors.defaultwords(t,str)
         n = n + 1 ; t[n] = tokens.egroup
     end
 end
+
+\stopluacode
+
+%D This used to be in \type {toks-tra.mkiv}:
+
+% used to be: \registerctxluafile{toks-tra}{}
+
+\unprotect
+
+%D Handy for manuals \unknown\ but not really used in practice, so it might
+%D become a runtime loaded module instead.
+
+\unexpanded\def\starttokens  [#1]{\ctxcommand{collecttokens("#1","stoptokens")}}
+           \let\stoptokens        \relax
+\unexpanded\def\flushtokens  [#1]{\ctxcommand{flushtokens("#1")}}
+\unexpanded\def\showtokens   [#1]{\ctxcommand{showtokens("#1")}}
+\unexpanded\def\testtokens   [#1]{\ctxcommand{testtokens("#1")}}
+\unexpanded\def\registertoken  #1{\ctxcommand{registertoken("#1")}}
+
+\let\toks_show\showtokens % we also support the primitive
+
+\unexpanded\def\showtokens{\doifelsenextoptional\toks_show\normalshowtokens}
+
+\protect \endinput
diff --git a/tex/context/modules/mkiv/s-fonts-tables.lua b/tex/context/modules/mkiv/s-fonts-tables.lua
index d9d7205de..8673ef398 100644
--- a/tex/context/modules/mkiv/s-fonts-tables.lua
+++ b/tex/context/modules/mkiv/s-fonts-tables.lua
@@ -27,6 +27,8 @@ local setlink             = nodes.setlink
 local hpack               = nodes.hpack
 local applyvisuals        = nodes.applyvisuals
 
+local lefttoright_code    = nodes.dirvalues.lefttoright
+
 local handle_positions    = fonts.handlers.otf.datasetpositionprocessor
 local handle_injections   = nodes.injections.handler
 
@@ -285,17 +287,9 @@ function tabletracers.showpositionings(specification)
 
     if resources then
 
-        local direction = "TLT"
-
+        local direction = lefttoright_code -- not that relevant probably
         local sequences = resources.sequences
         local marks     = resources.marks
-
-        if tonumber(direction) == -1 or direction == "TRT"  then
-            direction = "TRT"
-        else
-            direction = "TLT"
-        end
-
         local visuals   = "fontkern,glyph,box"
 
         local datasets  = fonts.handlers.otf.dataset(tfmdata,fontid,0)
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 0fb768cf8..67abf707b 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -66,9 +66,10 @@ for k, v in next, disccodes do
     disccodes[v] = k
 end
 
-nodes.nodecodes    = nodecodes
-nodes.glyphcodes   = glyphcodes
-nodes.disccodes    = disccodes
+nodes.nodecodes  = nodecodes
+nodes.glyphcodes = glyphcodes
+nodes.disccodes  = disccodes
+nodes.dirvalues  = { lefttoright = 0, righttoleft = 1 }
 
 nodes.handlers.protectglyphs   = node.protect_glyphs   -- beware: nodes!
 nodes.handlers.unprotectglyphs = node.unprotect_glyphs -- beware: nodes!
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ed2413858..fea429485 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2020-07-09 14:48
+-- merge date  : 2020-07-13 16:23
 
 do -- begin closure to overcome local limits and interference
 
@@ -3996,6 +3996,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['util-fil']={
  version=1.001,
+ optimize=true,
  comment="companion to luat-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -4916,6 +4917,7 @@ end
 nodes.nodecodes=nodecodes
 nodes.glyphcodes=glyphcodes
 nodes.disccodes=disccodes
+nodes.dirvalues={ lefttoright=0,righttoleft=1 }
 nodes.handlers.protectglyphs=node.protect_glyphs   
 nodes.handlers.unprotectglyphs=node.unprotect_glyphs
 local direct=node.direct
@@ -10388,6 +10390,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-map']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -10973,6 +10976,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-otr']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -12817,6 +12821,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-cff']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -14994,6 +14999,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-ttf']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -16166,6 +16172,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-dsp']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -21874,6 +21881,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-otj']={
  version=1.001,
+ optimize=true,
  comment="companion to font-lib.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -26502,6 +26510,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-ots']={ 
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -26604,6 +26613,8 @@ local disc_code=nodecodes.disc
 local math_code=nodecodes.math
 local dir_code=nodecodes.dir
 local localpar_code=nodecodes.localpar
+local lefttoright_code=nodes.dirvalues.lefttoright
+local righttoleft_code=nodes.dirvalues.righttoleft
 local discretionarydisc_code=disccodes.discretionary
 local ligatureglyph_code=glyphcodes.ligature
 local a_noligature=attributes.private("noligature")
@@ -29460,8 +29471,6 @@ local function k_run_multiple(sub,injection,last,font,attr,steps,nofsteps,datase
 end
 local txtdirstate,pardirstate  do 
  local getdirection=nuts.getdirection
- local lefttoright=0
- local righttoleft=1
  txtdirstate=function(start,stack,top,rlparmode)
   local dir,pop=getdirection(start)
   if pop then
@@ -29469,19 +29478,19 @@ local txtdirstate,pardirstate  do
     return 0,rlparmode
    else
     top=top-1
-    if stack[top]==righttoleft then
+    if stack[top]==righttoleft_code then
      return top,-1
     else
      return top,1
     end
    end
-  elseif dir==lefttoright then
+  elseif dir==lefttoright_code then
    top=top+1
-   stack[top]=lefttoright
+   stack[top]=lefttoright_code
    return top,1
-  elseif dir==righttoleft then
+  elseif dir==righttoleft_code then
    top=top+1
-   stack[top]=righttoleft
+   stack[top]=righttoleft_code
    return top,-1
   else
    return top,rlparmode
@@ -29489,13 +29498,9 @@ local txtdirstate,pardirstate  do
  end
  pardirstate=function(start)
   local dir=getdirection(start)
-  if dir==lefttoright then
+  if dir==lefttoright_code then
    return 1,1
-  elseif dir==righttoleft then
-   return -1,-1
-  elseif dir=="TLT" then
-   return 1,1
-  elseif dir=="TRT" then
+  elseif dir==righttoleft_code then
    return -1,-1
   else
    return 0,0
@@ -29550,7 +29555,7 @@ do
   local initialrl=0
   if getid(head)==localpar_code and start_of_par(head) then
    initialrl=pardirstate(head)
-  elseif direction==1 or direction=="TRT" then
+  elseif direction==righttoleft_code then
    initialrl=-1
   end
   local datasets=otfdataset(tfmdata,font,attr)
@@ -29774,7 +29779,7 @@ do
   local done=false
   local dirstack={ nil } 
   local start=head
-  local initialrl=(direction==1 or direction=="TRT") and -1 or 0
+  local initialrl=(direction==righttoleft_code) and -1 or 0
   local rlmode=initialrl
   local rlparmode=initialrl
   local topstack=0
@@ -33773,6 +33778,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-onr']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",
@@ -34147,6 +34153,7 @@ do -- begin closure to overcome local limits and interference
 
 if not modules then modules={} end modules ['font-one']={
  version=1.001,
+ optimize=true,
  comment="companion to font-ini.mkiv",
  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
  copyright="PRAGMA ADE / ConTeXt Development Team",