stable 2004.11.23

27 files changed, 663 insertions, 689 deletions

diff --git a/context/data/cont-cz-scite.properties b/context/data/cont-cz-scite.properties
index 6f0d4b9c8..4ea3b9305 100644
--- a/context/data/cont-cz-scite.properties
+++ b/context/data/cont-cz-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.cz=\
-    date underbar setuplinewidth disableinteractionmenu margintext stoptable \
-    setuplegend definepapersize interactionbar pagereference subject MONTH \
-    setuprotate placerule setupbuttons title setupcombinedlist stopenvironment \
-    stopnamemakeup keepblocks mirror labeltext month setuptyping \
-    fraction startcomponent setupquote someline coupledocument positiontext \
-    setupclipping setuptolerance seeregister typebuffer part background \
-    nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline startparagraph \
-    in startquotation inline stopfigure stoplocalfootnotes Words \
-    setupfloat definetextposition stopcolumns setupsectionblock tooltip overbars \
-    goto fixedspaces grid stophiding startlokalne defineregister \
-    stopopposite fillinline note stopproduct definebodyfontenvironment startoverview \
-    setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist decouplemarking \
-    placereferencelist definefont overstrike startbuffer numbers selectversion \
-    definefieldstack ran nospace stopsynchronization ref stopnarrower \
-    stopunpacked description setupinterlinespace setuptoptexts couplepaper placecombinedlist \
-    writetolist defineparagraphs setupblackrules setupinteractionscreen stopquotation typ \
-    labeling romannumerals weekday useexternalfiles setuptexttexts completelistofsorts \
-    marking definetextvariable screen definetabulate defineindenting showsymbolset \
-    stoplegend stoptabulate setupformulae item leftaligned about \
-    stoplocalenvironment column setupcolor definereference placefootnotes startline \
-    stopframedtext setupalign scale placeformula startcomment emptylines \
-    placeregister sym followversion setupoppositeplacing stopbuffer setupcapitals \
-    setupinteractionbar tab setuppagetransitions listsymbol copyfield comparecolorgroup \
-    startdocument subsubject Cap writetoregister setupsystem stopcomment \
-    splitfloat setupframed placelistofsynonyms setupfloatsplitting textreference setupfootertexts \
-    setupsorting clonefield setupdescriptions setupbuffer definesubfield stoplinecorrection \
-    blackrule setupinteraction followprofile definetype setupheads inmargin \
-    starttextrule fillintext synonym translate setupmarginblocks startbackground \
-    but Character stopinteractionmenu fitfield useexternalfile startfigure \
-    chem setuplabeltext referraldate setupmarking setupreferencing color \
-    completeregister startzlom donttest setuptables nomoreblocks setupcomment \
-    stoplokalne sort bookmark startlinecorrection setupversions startcombination \
-    startregister showgrid CAP definesorting setupfields setupmakeup \
-    determinelistcharacteristics lohi subsubsection stoptables definereferencelist godown \
-    setuppaper setupsymbolset installlanguage setuptop setupparagraphs setupscreens \
-    pagetype startcolor framed position stopitemgroup setupthinrules \
-    synchronize low setupbodyfont underbars startfloattext setuptext \
-    footnote defineprogram button defineframed placelist definebodyfont \
-    externalfigure completelistoffloats couplepage setupheadertexts setuppapersize definestartstop \
-    processblocks its stoplinenumbering opis enumeration stopmarginrule \
-    setuplanguage startversion definelogo inouter packed definetyping \
-    stopmarginblock setupparagraphnumbering definepalet inframed atpage stopline \
-    stoppacked placebookmarks setupframedtexts couplemarking startcolumns currentheadnumber \
-    useblocks whitespace page defineoverlay subsubsubject definerawfont \
-    inright setuppagenumbering field stopformula switchtobodyfont graycolor \
-    setuptab definecolorgroup startunpacked completelistofsynonyms stopparagraph definefloat \
-    reset defineprofile Characters useencoding rightaligned setupfooter \
-    defineoutput midaligned interactionbuttons space setupenumerations nowhitespace \
-    resetmarking showmakeup indentation stopprofile noheaderandfooterlines getbuffer \
-    nocap chapter stoptyping program currentdate marginrule \
-    definesynonyms Romannumerals nomarking stopcomponent symbol WORDS \
-    setupindentations definetext rotate setupinmargin setupblank completecombinedlist \
-    stopversion stoppositioning setupnarrower placeongrid definemarking definesection \
-    periods loadsorts definetabletemplate placefloat startinteractionmenu version \
-    defineenumeration showexternalfigures switchtorawfont startitemgroup starttyping setupwhitespace \
-    paragraph arg placesidebyside setupindenting showcolor startproduct \
-    showcolorgroup setupbackgrounds setuptextrules setupbottom selectblocks logfields \
-    startmarginrule processpage definehead publication startopposite stoptextrule \
-    definecolor indenting textrule moveongrid defineframedtext startpacked \
-    stopfloattext setupforms register setupbottomtexts placelegend determineheadnumber \
-    nextsection placelistoffloats startnamemakeup setupurl headtext defineconversion \
-    usecommands correctwhitespace setupexternalfigures quotation setupfield setupsynonyms \
-    definedescription definesectionblock ininner definebuffer section stretched \
-    startmarginblock setupspacing coupledregister definemakeup startprofile starttabulate \
-    typefile stopcombination useexternalfigure startfact startenumeration showstruts \
-    setuptabulate fillinrules placelistofsorts noindenting stopoverview footnotetext \
-    definefield markversion convertnumber setuprule blackrules subsection \
-    blank Word setupnumbering fillinfield character textvariable \
-    defineblank bypassblocks setupreferencelist usemodule nop starttable \
-    starttables showsetups stopzlom framedtext reference labels \
-    stopdocument setupcolors startenvironment starthiding setuparranging adding \
-    comment stopoverlay setuplinenumbering items stopbackground setupprograms \
-    placeontopofeachother appendix setuppublications characters setupsynchronizationbar nolist \
-    tex startdescription stopcolor name setupitemgroup fieldstack \
-    wordright settextvariable setupoutput stopfact definereferenceformat setupfootnotes \
-    startpositioning clip setupcaption startlegend followprofileversion stopdescription \
-    startalignment setuphead setupsynchronization setupstrut usedirectory setupmarginrules \
-    defineblock setupitems WORD startformula inothermargin showpalet \
-    stoppostponing startframedtext placelogos quote setupcombinations stopenumeration \
-    usespecials usesymbols startnarrower head startsynchronization adaptlayout \
-    setuptextposition inleft definefiguresymbol gotobox crlf setupfootnotedefinition \
-    startpostponing setupbackground placesubformula showprint WEEKDAY defineversion \
-    hl setupcaptions definerule setupfillinlines thinrules startoverlay \
-    setuptextvariable showframe forceblocks useexternalsoundtrack setuplist loadsynonyms \
-    notopandbottomlines setupblock defineinteractionmenu thinrule setupregister cap \
-    hideblocks setupfillinrules setupheader startsymbolset writebetweenlist definelabel \
-    overbar comparepalet setuppositioning reservefloat from showbodyfont \
-    stopalignment language define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+     zapisdoseznamuodkazu uzijbloky vpravo program nastavupravu \
+    stoptextovalinka vsedniden nastavdefinicipoznamekpodcarou definujodkaz nastavradkovani ukazsadusymbolu \
+    rozpojeneznaceni zarovnanonastred vyberpapir korekcebilehomista stopprostredi nastavzahlavi \
+    VSEDNIDEN opissoubor nastavblok symbol cernelinky vyplnovelinky \
+    konvertujcislo nastavpopisy jdidolu nastavprechodstrany uzijexternizvuk hlavnijazyk \
+    placerule propojenyrejstrik umistilegendu startcitace parovastrana definujvystup \
+    nastavprostredizakladnihofontu premistinamrizku definujodstavce ukazpodpery nastavkomentar positiontext \
+    nivy nastavtextpopisku definujkonverzi placefloat nastavzarovnani umistizalozky \
+    zapisdoseznamu nastavmarginalnilinky typebuffer uzijspeciality stopcitace nastavexterniobrazy \
+    switchtorawfont tvrdemezery ukazramecek startpozadi dvoustrannypapir nadruhyokraj \
+    ziskejbuffer slovovpravo arg klonujpole nastavhornitexty podtrzeni \
+    zrcadlit vysoky startzhustene nastavdolnitexty zpracujbloky zhustene \
+    strana definetextposition nastavinterakci nastavcislovaniradku synchronizovat umistirovnici \
+    popisky nastavprofily ukazbarvu ukazpole odkaz nastavtoleranci \
+    prelozit stopfakt nastavcislovaniodstavcu nastavtexthlavicky setupforms nastavbilamista \
+    definujprofil umistivedlesebe nastavtext tecky definujprostredizakladnihofontu ukazvzhled \
+    externiobraz nastavpopisky definujprogram umistinadsebe nastavodstavce vyplnovyradek \
+    zarovnanovlevo ran uzijkodovani nastavoramovanetexty umistipoznamkypodcarou SLOVA \
+    stopprojekt ref nastavopis ukazexterniobrazy nastavmarginalie odsazovani \
+    startprojekt uzijodkazy nastavmeziradkovoumezeru nastavpoznamkypodcarou Slovo jdinabox \
+    nastavpaletu nekde ininner komentar orez zapisdorejstriku \
+    ukazvytisk nastavtabulky vyplnenytext nastavbarvu nastavspojeni nastavsadusymbolu \
+    nastavoramovani tlacitko aktualnidatum prizpusobvzhled sloupec vlevo \
+    ukazpaletu uzijsymbol stopverze nastavvystup nastavseznam umistiseznam \
+    ukaznastaveni definetextvariable definujblok definujoramovani scitani jazyk \
+    stopkomponenta zasobnikpoli nastavtype zadneodsazovani nastavnadpis nastavcislovanistran \
+    texthlavicky footnotetext nastavorez nastavsloupce nastavbloksekce startprostredi \
+    zadnedalsibloky zadneznaceni definujsynonyma nastavtab setuprule synchronizacnilista \
+    odkaznastranu nastavumisteniprotejsku nastavpolozky definujrejstrik nastavbarvy textvariable \
+    propojenydokument nastavplvouciobjekt bypassblocks uzijexternisoubory nastavsynonyma nastavurl \
+    definujseznamodkazu zadnamezera nastavsirkucary definujpopisek zachovejbloky definujznaceni \
+    ukazmrizku nastavtextyupati emptylines umistipodrovnici nop nastavpopisek \
+    sym bublinkovanapoveda tab verze zapismeziseznam listsymbol \
+    definujprekryv zablokujinterakcnimenu uzijexterniobraz typstrany definujskupinubarev publikace \
+    nastavvycty definujformatodkazu nastavsynchronizacnilistu nastavrejstrik definujsekci nastavkombinovanyseznam \
+    pozice stopkomentar citovat nastavinterakcnilistu uzijURL nastavzakladnifont \
+    MESIC tenkelinky nastavdeleniplvoucichobjektu stopinteraktivnimenu definujvycet oref \
+    startverze cislonadpisu preskrtnuti nastavkapitalky zadnyseznam pol \
+    tex nastavtexttexty rimskecislice porovnejpaletu nastavpodcislostrany dodrzujprofil \
+    definujplvouciobjekt definetype otocit Slova vyplnovepole setupitemgroup \
+    umistinamrizku zaznamovepole prizpusobivepole startkomentar textpopisku definujoramovanytext \
+    settextvariable preskoc nadpis stanovcislonadpisu umistilokalnipoznamkypodcarou nejakyradek \
+    start Rimskecislice nastavtextyzahlavi podtrzeno znaky umistirejstrik \
+    zadnytest definujfont stanovcharakteristickuseznamu chem schovejbloky nastavvyplnoveradky \
+    cernalinka umistiseznamodkazu definujpodpole definujpole nastavpozadi definujbarvu \
+    completeregister nastavtenkelinky definujkombinovanyseznam znaceni definujzasobnikpoli uzijmodul \
+    startfakt zpracujstranu vyberbloky odkaznatext zadnehorniadolniradky pole \
+    meritko stopzhustene tref nastavumistovani definujvelikostpapiru definujpaletu \
+    nastavverze porovnejskupinubarev setupstrut oznacverzi nastavrastr roztazene \
+    nastavvyplnovelinky nastavsystem nastavtrideni pozadi nadtrzeno zadnezahlaviaupati \
+    ziskejznaceni setuppaper marginalnilinka nastavusporadani ukazskupinubarev pref \
+    nastavlegendu vradku setuptextposition umistikombinovanyseznam vyberverzi obrazovka \
+    zalozka crlf nastavznaceni datum definujstartstop definujpreskok \
+    nastavodkazovani nastavpreskok zlomek hl uzijexternisoubor nastavzuzeni \
+    kopirujpole uzijprikazy definujverzi definerule aktualnicislonadpisu preskrtnuto \
+    nastavmarginalniblok nastavcislonadpisu startmarginalnilinka nastavjazyk tenkalinka nadtrzeni \
+    definujbuffer nastavradky setuptextvariable forceblocks startkomponenta nastavnadpisy \
+    zaramovani definujlogo textovalinka definujtext nastavseznamodkazu mezera \
+    sedabarva dodrzujverziprofilu mrizka nastavcernelinky Znak nastavsekci \
+    znak barva propojeneznaceni nastavpole naokraj rozdelplvouciobjekt \
+    nastavtlacitka jdina opis nastavinterakcniobrazovku definujbloksekce resetznaceni \
+    interakcnilista definujtabelaci stopbarva nastavsynchronizaci nastavotoceni nastavcislostrany \
+    vlasovalinka poznamkapodcarou ukazzakladnifont mesic zref nastavhorejsek \
+    nastavpublikace inouter definujseznam stoppozadi definujobrazeksymbol definujsablonutabulky \
+    prepninazakladnifont nastavvsechnapole cisla SLOVO nastavpodtrzeni instalacejazyka \
+    odkaznadatum nastavplvouciobjekty ukazpostredizakladnihofontu definujinterakcnimenu starttextovalinka nastavvzhled \
+    pis marginalnitext nastavupati nastavtabelaci zadnebilemisto definujodsazovani \
+    nastavdelitko nastavodsazovani uzijexternidokument definujopis definujtrideni vl \
+    spodek zarovnanovpravo startbarva definerawfont citace nizky \
+    poznamka bilemisto definujpopis nastavcitaci definujnadpis umistiloga \
+    nastrane startinteraktivnimenu nastavtextovelinky interakcnitlacitka nastavvelikostpapiru zadnedalsisoubory \
+    polozka oramovani polozky stopmarginalnilinka definujzakladnifont ukazupravu \
+    reset definuj nastavcislovani okr dodrzujverzi definujsymbol \
+    stop nastavspodek nastavprogramy nastavbuffer matematika placetextvariable \
+    definujupravu Znaky 
diff --git a/context/data/cont-de-scite.properties b/context/data/cont-de-scite.properties
index b38ec08c7..fbdd07714 100644
--- a/context/data/cont-de-scite.properties
+++ b/context/data/cont-de-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.de=\
-    date underbar startlokal setuplinewidth disableinteractionmenu margintext \
-    stoptable setuplegend definepapersize interactionbar pagereference subject \
-    MONTH setuprotate placerule setupbuttons title setupcombinedlist \
-    stopenvironment stopnamemakeup keepblocks mirror labeltext month \
-    setuptyping fraction startcomponent setupquote someline coupledocument \
-    positiontext setupclipping setuptolerance seeregister typebuffer part \
-    background nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline \
-    startparagraph in startquotation inline stopfigure stoplocalfootnotes \
-    Words setupfloat type definetextposition stopcolumns setupsectionblock \
-    tooltip overbars goto fixedspaces grid stophiding \
-    defineregister stopopposite fillinline note stopproduct definebodyfontenvironment \
-    startoverview setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist \
-    decouplemarking placereferencelist definefont overstrike startbuffer numbers \
-    selectversion definefieldstack ran nospace stopsynchronization ref \
-    stopnarrower stopunpacked description setupinterlinespace setuptoptexts couplepaper \
-    placecombinedlist writetolist defineparagraphs setupblackrules setupinteractionscreen stopquotation \
-    typ labeling romannumerals weekday useexternalfiles setuptexttexts \
-    completelistofsorts marking definetextvariable screen definetabulate defineindenting \
-    showsymbolset stoplegend stoptabulate setupformulae item leftaligned \
-    about stoplocalenvironment column setupcolor definereference placefootnotes \
-    startline stopframedtext setupalign scale placeformula startcomment \
-    emptylines placeregister sym followversion setupoppositeplacing stopbuffer \
-    setupcapitals setupinteractionbar tab setuppagetransitions listsymbol copyfield \
-    comparecolorgroup startdocument subsubject Cap writetoregister setupsystem \
-    stopcomment splitfloat setupframed placelistofsynonyms setupfloatsplitting textreference \
-    setupfootertexts setupsorting clonefield setupdescriptions setupbuffer definesubfield \
-    stoplinecorrection blackrule setupinteraction followprofile definetype setupheads \
-    inmargin starttextrule fillintext synonym translate setupmarginblocks \
-    startbackground but Character stopinteractionmenu fitfield useexternalfile \
-    startfigure chem setuplabeltext referraldate setupmarking setupreferencing \
-    color completeregister donttest setuptables nomoreblocks setupcomment \
-    sort bookmark startlinecorrection setupversions startcombination startregister \
-    showgrid CAP definesorting setupfields setupmakeup determinelistcharacteristics \
-    lohi subsubsection stoptables definereferencelist godown setuppaper \
-    setupsymbolset installlanguage setuptop setupparagraphs setupscreens pagetype \
-    stopumbruch startcolor framed position stopitemgroup setupthinrules \
-    synchronize low setupbodyfont underbars startfloattext setuptext \
-    stoplokal footnote defineprogram button defineframed placelist \
-    definebodyfont externalfigure completelistoffloats couplepage setupheadertexts setuppapersize \
-    definestartstop processblocks its stoplinenumbering enumeration stopmarginrule \
-    setuplanguage startversion definelogo inouter packed definetyping \
-    stopmarginblock setupparagraphnumbering definepalet inframed atpage stopline \
-    stoppacked placebookmarks setupframedtexts couplemarking startcolumns currentheadnumber \
-    useblocks whitespace page defineoverlay subsubsubject definerawfont \
-    inright setuppagenumbering field stopformula switchtobodyfont graycolor \
-    setuptab definecolorgroup startunpacked completelistofsynonyms stopparagraph definefloat \
-    reset defineprofile Characters useencoding rightaligned setupfooter \
-    defineoutput midaligned interactionbuttons space setupenumerations nowhitespace \
-    resetmarking showmakeup indentation stopprofile noheaderandfooterlines getbuffer \
-    nocap chapter stoptyping program currentdate marginrule \
-    definesynonyms Romannumerals nomarking stopcomponent symbol WORDS \
-    setupindentations definetext rotate setupinmargin setupblank completecombinedlist \
-    stopversion stoppositioning setupnarrower placeongrid definemarking definesection \
-    periods loadsorts definetabletemplate placefloat startinteractionmenu version \
-    defineenumeration showexternalfigures switchtorawfont startitemgroup starttyping setupwhitespace \
-    paragraph arg placesidebyside setupindenting showcolor startproduct \
-    showcolorgroup setupbackgrounds setuptextrules setupbottom selectblocks logfields \
-    startmarginrule processpage definehead publication startopposite stoptextrule \
-    definecolor indenting textrule moveongrid defineframedtext startpacked \
-    stopfloattext startumbruch setupforms register setupbottomtexts placelegend \
-    determineheadnumber nextsection placelistoffloats startnamemakeup setupurl headtext \
-    defineconversion usecommands correctwhitespace setupexternalfigures quotation setupfield \
-    setupsynonyms definedescription definesectionblock ininner definebuffer section \
-    stretched startmarginblock setupspacing coupledregister definemakeup startprofile \
-    starttabulate typefile stopcombination useexternalfigure startfact startenumeration \
-    showstruts setuptabulate fillinrules placelistofsorts noindenting stopoverview \
-    footnotetext definefield markversion convertnumber setuprule blackrules \
-    subsection blank Word setupnumbering fillinfield character \
-    textvariable defineblank bypassblocks setupreferencelist usemodule nop \
-    starttable starttables showsetups framedtext reference labels \
-    stopdocument setupcolors startenvironment starthiding setuparranging adding \
-    comment stopoverlay setuplinenumbering items stopbackground setupprograms \
-    placeontopofeachother appendix setuppublications characters setupsynchronizationbar nolist \
-    tex startdescription stopcolor name setupitemgroup fieldstack \
-    wordright settextvariable setupoutput stopfact definereferenceformat setupfootnotes \
-    startpositioning clip setupcaption startlegend followprofileversion stopdescription \
-    startalignment setuphead setupsynchronization setupstrut usedirectory setupmarginrules \
-    defineblock setupitems WORD startformula inothermargin showpalet \
-    stoppostponing startframedtext placelogos quote setupcombinations stopenumeration \
-    usespecials usesymbols startnarrower head startsynchronization adaptlayout \
-    setuptextposition inleft definefiguresymbol gotobox crlf setupfootnotedefinition \
-    startpostponing setupbackground placesubformula showprint WEEKDAY defineversion \
-    hl setupcaptions definerule setupfillinlines thinrules startoverlay \
-    setuptextvariable showframe forceblocks useexternalsoundtrack setuplist loadsynonyms \
-    notopandbottomlines setupblock defineinteractionmenu thinrule setupregister cap \
-    hideblocks setupfillinrules setupheader startsymbolset writebetweenlist definelabel \
-    overbar comparepalet setuppositioning reservefloat from showbodyfont \
-    stopalignment language define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+    stellepapierformatein  doppelseite startgeg stellesynchronisationsbalkenein keinzwischenraum \
+    definieregleitobjekt seitentyp stelletextein definieresymbol seitenreferenz verwendereferenzen \
+    symbol definierereferenzliste marginaltext definierefeld WOCHENTAG durchstreichen \
+    gefuelltesrechteck stelleueberschriftein Woerter WOERTER stelleexterneabbildungenein placerule \
+    stelleuntenein definieren folgeprofil stopversion labeltext gefuelltezeile \
+    benutzekodierung bei stellefussnotendefinitionein keinebeschriftung positiontext beschriftung \
+    placefloat bestimmelistencharakeristika keinzeilenobenundunten unterstrichen synchronisationsbalken stelleinteraktionein \
+    version bruch stellekopfzeileein referenz switchtorawfont stellezitierenein \
+    verbergebloecke stophintergrund stopkommentar stelleregisterein zeigefliesstext stellepufferein \
+    stelleueberschriftenein amgitterausrichten stellefusszeileein stoptextlinie definiereliste arg \
+    zentriert holepuffer wortrechts platziereliste in startfarbe \
+    inzeile definierefliesstext platziereregister stelleknopfein waehlepapieraus stellezeilenein \
+    stellegegenueberplatzierenein amgitterneuausrichten keinedateienmehr schreibezurreferenzliste stellehintergruendeein imrechten \
+    definetextposition stopzitat stellelinienbreiteein klonierefeld stellesynonymein zurbox \
+    stellelabeltextein tooltip programm stelleinteraktionsbildschirmein kopierefeld definieresynonyme \
+    stelletextuntenein definierefliesstextumgebung zeigefarbe konvertierezahl definiereblanko setupforms \
+    Wort stellebilderunterschriftein platzierelegende korrigierezwischenraum inanderermarginale definieretabulator \
+    keinebloeckemehr stelleblankoein stellelisteein stellegefuelltesrechteckein starthintergrund stelleinteraktionsbalkenein \
+    stelleanordnenein holebeschriftung stellepostenein stellezwischenraumein spiegeln ueberstreichen \
+    stelleengerein ran verwendemodul stellemarginallinieein stopprojekt ref \
+    verknuepfregister definierestartstop startprojekt keinekopfundfusszeilen stellesystemein startumgebung \
+    stelletextobenein stellespracheein stellegleitobjektein textreferenz kommentar ininner \
+    definiereabbsymbol definierereferenz roemischezahlen stellepublikationein platzierenebeneinander feldstapel \
+    stellefelderin notiz stopinteraktionsmenue stellespaltenein platzierereferenzliste pos \
+    platziereuntereinander hintergrund verwendeexternedateien definetextvariable uebersetzten zeigepalette \
+    showsymbolset stellerechteckein Buchstaben footnotetext irgendwo definierefarbe \
+    MONAT linksbuendig stellekopfzeilentextein unterstreichen verwendeexternedatei zeigelayout \
+    stellepositionierenein stelleduennerumrissein setuprule kopf stelleseitennummerein definierebeschreibung \
+    definiereumrahmt definierezusammengestellteliste keineliste stellekombinationein einziehen schreibezumregister \
+    ruecksetzten textvariable bypassblocks festesspatium verwendeURL platzierezusammengestellteliste \
+    rechtsbuendig platzierelokalefussnoten installieresprache zu wochentag rechtecke \
+    heutigesdatum emptylines nop bestimmekopfnummer platzierebookmarks passelayoutan \
+    sym imumriss verknuepfebeschriftung stelleprofilein tab stopfarbe \
+    starttextlinie stelleabschnittein entknuepfebeschriftung definierefeldstapel stelleabschnittsblockein listsymbol \
+    stellemarginalblockein labels definieretippen stelleprogrammein tippedatei definierepuffer \
+    definierebeschriftung definierepalette von Buchstabe stelleumrahmtein zeigerahmen \
+    stellefeldein format stellebildunterschriftein passendfeld einezeile stellefarbeein \
+    stellezeilenabstandein vergleichepalette duennelinie stelleblockein hauptsprache ausfuellfeld \
+    stelleausschnittein blanko stelleueberschrifttextein startinteraktionsmenue definiereabschnitt tex \
+    wechselezumfliesstext stelletabein zeigeumbruch definiereumbruch definierelabel interaktionsbalken \
+    definetype stelleabsaetzeein stelletabulatorein doppelseitigespapier setupitemgroup stellebindestrichein \
+    zeigefliesstextumgebung stopkleinerdurchschuss but settextvariable start stellehintergrundein \
+    stellegefuelltezeileein chem stelleseitennummeriernungein zeigeexterneabbildungen definieretabellenvorlage beschrifteversion \
+    behaltebloecke completeregister verwendebefehl benutzespezielles zeigestruts feld \
+    stopgeg definierekonversion zusatz stellepaletteein tippen heutigeskopfnummer \
+    stelletextumrissein ueberstrichen stelletippenein bookmark verknuepfedokument setupstrut \
+    stellelayoutein stelleabsatznummerierungein stelletoleranzein stellefarbenein definiereinteraktionsmenue tief \
+    kleinerdurchschuss stellerasterein rechteck startkomponente stellegleitobjekteein nachunten \
+    vergleichefarbengruppe posten WORT stelletabellenein setuppaper stellefussnotenein \
+    seite umrahmt ueber setuptextposition definiereabschnittsblock stelleumbruchein \
+    drehen schreibezwischenliste folgeversion crlf folgeprofilversion datum \
+    definiereprofil nichteinziehen zeigefelder knopf tiho position \
+    stopmarginallinie graufarbe schreibezurliste externeabbildung synchronisieren hl \
+    stelleseitenuebergangein stellelegendeein stelletipein definerule stelleinmarginalieein kopfnummer \
+    marginallinie farbe textlinie ausfuelltext zitieren definierepapierformat \
+    definiereabsaetze definiereoverlay ziffern stellezusammengestelltelisteein setuptextvariable definiereversion \
+    zwischenraum forceblocks verweisdatum stelleunterstreichenein hoch definieretext \
+    stellereferenzlisteein buchstabe tip sprache definiereeinzug definiereueberschrift \
+    stellesymbolsetein stellenummerierungein mathematik stellespatiumein its stelleumrahmtetexteein \
+    stellezeilennumerierungein verweis waehlebloeckeaus stellesynchronisationein tippepuffer definieresortieren \
+    zitat bildschirm definiereblock stellebeschreibungein waehleversionaus startkommentar \
+    monat zeigeeinstellungen definierereferenzformat stopumgebung inaktiviereinteraktionsmenue stellefliesstextumgebungein \
+    startversion inouter spatium gitter verwendesymbole zeigegitter \
+    stelleplatziegeteiltegleitobjekt durchgestrichen verwendeexteresdokument stelledrehenein platzierelogo startzitat \
+    startkleinerdurchschuss stelleurlein Roemischezahlen ueberschrifttext stelleversionein publikation \
+    definiereschrift imlinken definiereregister stelleeinziehenein haarlinie gestreckt \
+    stelleeinzuegein platziereformel vl stellefusszeilentextein duennerumriss spalte \
+    definerawfont stelleversalienein platziereunterformel stelleausgabeein verwendeexterneabbildung stellesortierenein \
+    zeigefarbengruppe interaktionsknopfe mar stellenobenein startmarginallinie verwendeexternestonstueck \
+    definierenummerierung bearbeitebloecke keintest aufseite definierebeschreibungen stopkomponente \
+    bearbeiteseite ruecksetztenbeschriftung stelleausrichtungein definierelogo registrierefelder zeigedruck \
+    teilegleitobjekt stellekommentarein ausschnitt definiereprogramme definierefarbengruppe stellebeschriftungein \
+    stellereferenzierenein stelleunterseitennummerein buchstaben definiereumrahmtertext punkt platzierefussnoten \
+    stelletexttexteein inmarginalie keinspatium stellekopfzahlein defineoutput stellefliesstextein \
+    stop fussnote placetextvariable verwendebloecke definieresubfeld 
diff --git a/context/data/cont-en-scite.properties b/context/data/cont-en-scite.properties
index 305b3c531..8022ed443 100644
--- a/context/data/cont-en-scite.properties
+++ b/context/data/cont-en-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.en=\
-    date underbar setuplinewidth disableinteractionmenu margintext stoptable \
-    setuplegend stoplocal definepapersize interactionbar pagereference subject \
-    MONTH setuprotate placerule setupbuttons title setupcombinedlist \
-    stopenvironment stopnamemakeup keepblocks mirror labeltext month \
-    setuptyping fraction startcomponent setupquote someline coupledocument \
-    positiontext setupclipping setuptolerance seeregister typebuffer part \
-    background nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline \
-    startparagraph in startquotation inline stopfigure stoplocalfootnotes \
-    Words setupfloat type definetextposition stopcolumns setupsectionblock \
-    tooltip overbars goto fixedspaces grid stophiding \
-    defineregister stopopposite fillinline note stopproduct definebodyfontenvironment \
-    startoverview setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist \
-    decouplemarking placereferencelist definefont overstrike startbuffer numbers \
-    selectversion startlocal definefieldstack ran nospace stopsynchronization \
-    ref stopnarrower stopunpacked description setupinterlinespace setuptoptexts \
-    couplepaper placecombinedlist writetolist defineparagraphs setupblackrules setupinteractionscreen \
-    stopquotation typ labeling romannumerals weekday useexternalfiles \
-    setuptexttexts completelistofsorts marking definetextvariable screen definetabulate \
-    defineindenting showsymbolset stoplegend stoptabulate setupformulae item \
-    leftaligned about stoplocalenvironment column setupcolor definereference \
-    placefootnotes startline stopframedtext setupalign scale placeformula \
-    startcomment emptylines placeregister sym followversion setupoppositeplacing \
-    stopbuffer setupcapitals setupinteractionbar tab setuppagetransitions listsymbol \
-    copyfield comparecolorgroup startdocument subsubject Cap writetoregister \
-    setupsystem stopcomment splitfloat setupframed placelistofsynonyms setupfloatsplitting \
-    textreference setupfootertexts setupsorting clonefield setupdescriptions setupbuffer \
-    definesubfield stoplinecorrection blackrule setupinteraction followprofile definetype \
-    setupheads inmargin starttextrule fillintext stopmakeup synonym \
-    translate setupmarginblocks startbackground but Character stopinteractionmenu \
-    fitfield useexternalfile startfigure chem setuplabeltext referraldate \
-    setupmarking setupreferencing color completeregister donttest setuptables \
-    nomoreblocks startmakeup setupcomment sort bookmark startlinecorrection \
-    setupversions startcombination startregister showgrid CAP definesorting \
-    setupfields setupmakeup determinelistcharacteristics lohi subsubsection stoptables \
-    definereferencelist godown setuppaper setupsymbolset installlanguage setuptop \
-    setupparagraphs setupscreens pagetype startcolor framed position \
-    stopitemgroup setupthinrules synchronize low setupbodyfont underbars \
-    startfloattext setuptext footnote defineprogram button defineframed \
-    placelist definebodyfont externalfigure completelistoffloats couplepage setupheadertexts \
-    setuppapersize definestartstop processblocks its stoplinenumbering enumeration \
-    stopmarginrule setuplanguage startversion definelogo inouter packed \
-    definetyping stopmarginblock setupparagraphnumbering definepalet inframed atpage \
-    stopline stoppacked placebookmarks setupframedtexts couplemarking startcolumns \
-    currentheadnumber useblocks whitespace page defineoverlay subsubsubject \
-    definerawfont inright setuppagenumbering field stopformula switchtobodyfont \
-    graycolor setuptab definecolorgroup startunpacked completelistofsynonyms stopparagraph \
-    definefloat reset defineprofile Characters useencoding rightaligned \
-    setupfooter defineoutput midaligned interactionbuttons space setupenumerations \
-    nowhitespace resetmarking showmakeup indentation stopprofile noheaderandfooterlines \
-    getbuffer nocap chapter stoptyping program currentdate \
-    marginrule definesynonyms Romannumerals nomarking stopcomponent symbol \
-    WORDS setupindentations definetext rotate setupinmargin setupblank \
-    completecombinedlist stopversion stoppositioning setupnarrower placeongrid definemarking \
-    definesection periods loadsorts definetabletemplate placefloat startinteractionmenu \
-    version defineenumeration showexternalfigures switchtorawfont startitemgroup starttyping \
-    setupwhitespace paragraph arg placesidebyside setupindenting showcolor \
-    startproduct showcolorgroup setupbackgrounds setuptextrules setupbottom selectblocks \
-    logfields startmarginrule processpage definehead publication startopposite \
-    stoptextrule definecolor indenting textrule moveongrid defineframedtext \
-    startpacked stopfloattext setupforms register setupbottomtexts placelegend \
-    determineheadnumber nextsection placelistoffloats startnamemakeup setupurl headtext \
-    defineconversion usecommands correctwhitespace setupexternalfigures quotation setupfield \
-    setupsynonyms definedescription definesectionblock ininner definebuffer section \
-    stretched startmarginblock setupspacing coupledregister definemakeup startprofile \
-    starttabulate typefile stopcombination useexternalfigure startfact startenumeration \
-    showstruts setuptabulate fillinrules placelistofsorts noindenting stopoverview \
-    footnotetext definefield markversion convertnumber setuprule blackrules \
-    subsection blank Word setupnumbering fillinfield character \
-    textvariable defineblank bypassblocks setupreferencelist usemodule nop \
-    starttable starttables showsetups framedtext reference labels \
-    stopdocument setupcolors startenvironment starthiding setuparranging adding \
-    comment stopoverlay setuplinenumbering items stopbackground setupprograms \
-    placeontopofeachother appendix setuppublications characters setupsynchronizationbar nolist \
-    tex startdescription stopcolor name setupitemgroup fieldstack \
-    wordright settextvariable setupoutput stopfact definereferenceformat setupfootnotes \
-    startpositioning clip setupcaption startlegend followprofileversion stopdescription \
-    startalignment setuphead setupsynchronization setupstrut usedirectory setupmarginrules \
-    defineblock setupitems WORD startformula inothermargin showpalet \
-    stoppostponing startframedtext placelogos quote setupcombinations stopenumeration \
-    usespecials usesymbols startnarrower head startsynchronization adaptlayout \
-    setuptextposition inleft definefiguresymbol gotobox crlf setupfootnotedefinition \
-    startpostponing setupbackground placesubformula showprint WEEKDAY defineversion \
-    hl setupcaptions definerule setupfillinlines thinrules startoverlay \
-    setuptextvariable showframe forceblocks useexternalsoundtrack setuplist loadsynonyms \
-    notopandbottomlines setupblock defineinteractionmenu thinrule setupregister cap \
-    hideblocks setupfillinrules setupheader startsymbolset writebetweenlist definelabel \
-    overbar comparepalet setuppositioning reservefloat from showbodyfont \
-    stopalignment language define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+     showmakeup getbuffer noheaderandfooterlines date underbar \
+    setuplinewidth program currentdate definesynonyms marginrule disableinteractionmenu \
+    margintext Romannumerals stopcomponent nomarking setuplegend definepapersize \
+    symbol interactionbar pagereference setupindentations WORDS MONTH \
+    definetext rotate setuprotate setupinmargin placerule setupbuttons \
+    setupcombinedlist stopenvironment setupblank keepblocks stopversion mirror \
+    labeltext month setupnarrower setuptyping fraction startcomponent \
+    setupquote someline placeongrid periods definesection definemarking \
+    coupledocument definetabletemplate positiontext setupclipping setuptolerance placefloat \
+    startinteractionmenu typebuffer version defineenumeration background showexternalfigures \
+    switchtorawfont nomorefiles setuplines setupsubpagenumber setupwhitespace setuphyphenmark \
+    hairline arg placesidebyside setupindenting showcolor in \
+    showcolorgroup startquotation inline setupbackgrounds setupbottom setuptextrules \
+    selectblocks logfields startmarginrule processpage Words definehead \
+    setupfloat publication type definetextposition stoptextrule definecolor \
+    setupsectionblock tooltip indenting textrule moveongrid overbars \
+    goto defineframedtext fixedspaces grid startpacked defineregister \
+    fillinline note setupforms definebodyfontenvironment setuppagenumber setupbottomtexts \
+    setupunderbar overstrikes placelegend definecombinedlist writetoreferencelist decouplemarking \
+    determineheadnumber placereferencelist definefont overstrike numbers selectversion \
+    definefieldstack ran nospace setupurl headtext defineconversion \
+    ref usecommands correctwhitespace setupexternalfigures quotation setupinterlinespace \
+    setuptoptexts setupfield setupsynonyms couplepaper placecombinedlist definedescription \
+    definesectionblock writetolist definebuffer ininner stretched defineparagraphs \
+    setupblackrules setupinteractionscreen stopquotation setupspacing definemakeup typ \
+    romannumerals typefile weekday useexternalfiles setuptexttexts useexternalfigure \
+    startfact marking definetextvariable showstruts screen definetabulate \
+    setuptabulate defineindenting fillinrules showsymbolset noindenting item \
+    footnotetext definefield markversion leftaligned convertnumber setuprule \
+    blank blackrules about Word setupnumbering column \
+    setupcolor definereference fillinfield placefootnotes character textvariable \
+    bypassblocks defineblank setupalign scale placeformula startcomment \
+    setupreferencelist emptylines nop usemodule placeregister sym \
+    followversion setupoppositeplacing setupcapitals showsetups setupinteractionbar reference \
+    tab setuppagetransitions listsymbol labels copyfield comparecolorgroup \
+    setupcolors writetoregister startenvironment setupsystem setuparranging stopcomment \
+    adding comment setuplinenumbering items splitfloat stopbackground \
+    setupframed setupprograms placeontopofeachother setupfloatsplitting setuppublications characters \
+    textreference setupsynchronizationbar setupfootertexts setupsorting nolist clonefield \
+    setupdescriptions setupbuffer tex definesubfield stopcolor blackrule \
+    setupinteraction followprofile definetype setupheads inmargin starttextrule \
+    setupitemgroup fillintext fieldstack wordright translate setupmarginblocks \
+    startbackground but Character settextvariable stopinteractionmenu fitfield \
+    start useexternalfile chem setupoutput setuplabeltext stopfact \
+    referraldate setupfootnotes definereferenceformat setupmarking color setupreferencing \
+    clip completeregister setupcaption followprofileversion donttest setuptables \
+    nomoreblocks setupcomment setuphead bookmark setupsynchronization setupversions \
+    showgrid setupstrut setupitems defineblock setupmarginrules definesorting \
+    WORD setupfields setupmakeup determinelistcharacteristics lohi inothermargin \
+    showpalet definereferencelist godown setupcombinations quote placelogos \
+    usespecials usesymbols head setuppaper setupsymbolset installlanguage \
+    adaptlayout setuptextposition inleft setuptop definefiguresymbol gotobox \
+    setupparagraphs setupscreens pagetype setupfootnotedefinition startcolor crlf \
+    framed setupbackground placesubformula position showprint WEEKDAY \
+    defineversion setupthinrules hl synchronize low setupcaptions \
+    definerule setupbodyfont setupfillinlines underbars thinrules setuptext \
+    footnote defineprogram button defineframed setuptextvariable showframe \
+    definebodyfont placelist useexternalsoundtrack forceblocks externalfigure couplepage \
+    setuplist setupblock notopandbottomlines defineinteractionmenu setupheadertexts setuppapersize \
+    definestartstop setupregister thinrule processblocks its hideblocks \
+    setupfillinrules setupheader stopmarginrule writebetweenlist definelabel setuplanguage \
+    startversion definelogo overbar inouter packed definetyping \
+    comparepalet setuppositioning setupparagraphnumbering definepalet from inframed \
+    showbodyfont atpage language useexternaldocument stoppacked define \
+    placebookmarks setupframedtexts couplemarking usereferences setupfloats currentheadnumber \
+    synchronizationbar useblocks setupbodyfontenvironment definelist whitespace placelocalfootnotes \
+    page vl startproject defineoverlay definerawfont mathematics \
+    showbodyfontenvironment showfields inright setuppagenumbering field stopproject \
+    switchtobodyfont graycolor setuptab mar definecolorgroup useURL \
+    referral setuppalet coupleregister setupheadnumber setupsection setuplayout \
+    high definefloat definesymbol reset mainlanguage defineprofile \
+    at Characters selectpaper useencoding rightaligned getmarking \
+    setupfooter defineoutput setuptype stop midaligned interactionbuttons \
+    setupcolumns space placetextvariable setupheadtext setupenumerations showlayout \
+    nowhitespace resetmarking setupprofiles headnumber somewhere 
diff --git a/context/data/cont-it-scite.properties b/context/data/cont-it-scite.properties
index 068c3dd89..51199d515 100644
--- a/context/data/cont-it-scite.properties
+++ b/context/data/cont-it-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.it=\
-    date underbar setuplinewidth disableinteractionmenu margintext stoptable \
-    setuplegend definepapersize interactionbar pagereference subject MONTH \
-    setuprotate placerule setupbuttons title setupcombinedlist stopenvironment \
-    stopnamemakeup keepblocks mirror labeltext month setuptyping \
-    fraction startcomponent setupquote someline coupledocument positiontext \
-    setupclipping setuptolerance seeregister typebuffer part background \
-    nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline startparagraph \
-    in startquotation inline stopfigure stoplocalfootnotes Words \
-    setupfloat type definetextposition stopcolumns setupsectionblock tooltip \
-    overbars goto fixedspaces grid stophiding defineregister \
-    stopopposite fillinline note stopproduct definebodyfontenvironment startoverview \
-    setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist decouplemarking \
-    placereferencelist definefont overstrike startbuffer numbers selectversion \
-    definefieldstack ran nospace stopsynchronization ref stopnarrower \
-    stopunpacked description setupinterlinespace setuptoptexts couplepaper placecombinedlist \
-    writetolist defineparagraphs setupblackrules setupinteractionscreen stopquotation typ \
-    labeling romannumerals weekday useexternalfiles setuptexttexts completelistofsorts \
-    marking definetextvariable screen definetabulate defineindenting showsymbolset \
-    stoplegend stoptabulate setupformulae item leftaligned about \
-    stoplocalenvironment column setupcolor definereference placefootnotes startline \
-    stopframedtext setupalign scale placeformula startcomment emptylines \
-    placeregister sym followversion setupoppositeplacing stopbuffer setupcapitals \
-    setupinteractionbar tab setuppagetransitions listsymbol copyfield comparecolorgroup \
-    startdocument subsubject Cap writetoregister setupsystem stopcomment \
-    splitfloat setupframed placelistofsynonyms setupfloatsplitting textreference setupfootertexts \
-    setupsorting clonefield setupdescriptions setupbuffer definesubfield stoplinecorrection \
-    blackrule setupinteraction followprofile definetype setupheads inmargin \
-    starttextrule fillintext stopmakeup synonym translate setupmarginblocks \
-    startbackground but Character stopinteractionmenu fitfield useexternalfile \
-    startfigure chem setuplabeltext referraldate setupmarking setupreferencing \
-    color completeregister donttest setuptables nomoreblocks startmakeup \
-    startlocale setupcomment sort bookmark startlinecorrection setupversions \
-    startcombination startregister showgrid CAP definesorting setupfields \
-    setupmakeup determinelistcharacteristics lohi subsubsection stoptables definereferencelist \
-    godown setuppaper setupsymbolset installlanguage setuptop setupparagraphs \
-    setupscreens pagetype startcolor framed stoplocale position \
-    stopitemgroup setupthinrules synchronize low setupbodyfont underbars \
-    startfloattext setuptext footnote defineprogram button defineframed \
-    placelist definebodyfont externalfigure completelistoffloats couplepage setupheadertexts \
-    setuppapersize definestartstop processblocks its stoplinenumbering enumeration \
-    stopmarginrule setuplanguage startversion definelogo inouter packed \
-    definetyping stopmarginblock setupparagraphnumbering definepalet inframed atpage \
-    stopline stoppacked placebookmarks setupframedtexts couplemarking startcolumns \
-    currentheadnumber useblocks whitespace page defineoverlay subsubsubject \
-    definerawfont inright setuppagenumbering field stopformula switchtobodyfont \
-    graycolor setuptab definecolorgroup startunpacked completelistofsynonyms stopparagraph \
-    definefloat reset defineprofile Characters useencoding rightaligned \
-    setupfooter defineoutput midaligned interactionbuttons space setupenumerations \
-    nowhitespace resetmarking showmakeup indentation stopprofile noheaderandfooterlines \
-    getbuffer nocap chapter stoptyping program currentdate \
-    marginrule definesynonyms Romannumerals nomarking stopcomponent symbol \
-    WORDS setupindentations definetext rotate setupinmargin setupblank \
-    completecombinedlist stopversion stoppositioning setupnarrower placeongrid definemarking \
-    definesection periods loadsorts definetabletemplate placefloat startinteractionmenu \
-    version defineenumeration showexternalfigures switchtorawfont startitemgroup starttyping \
-    setupwhitespace paragraph arg placesidebyside setupindenting showcolor \
-    startproduct showcolorgroup setupbackgrounds setuptextrules setupbottom selectblocks \
-    logfields startmarginrule processpage definehead publication startopposite \
-    stoptextrule definecolor indenting textrule moveongrid defineframedtext \
-    startpacked stopfloattext setupforms register setupbottomtexts placelegend \
-    determineheadnumber nextsection placelistoffloats startnamemakeup setupurl headtext \
-    defineconversion usecommands correctwhitespace setupexternalfigures quotation setupfield \
-    setupsynonyms definedescription definesectionblock ininner definebuffer section \
-    stretched startmarginblock setupspacing coupledregister definemakeup startprofile \
-    starttabulate typefile stopcombination useexternalfigure startfact startenumeration \
-    showstruts setuptabulate fillinrules placelistofsorts noindenting stopoverview \
-    footnotetext definefield markversion convertnumber setuprule blackrules \
-    subsection blank Word setupnumbering fillinfield character \
-    textvariable defineblank bypassblocks setupreferencelist usemodule nop \
-    starttable starttables showsetups framedtext reference labels \
-    stopdocument setupcolors startenvironment starthiding setuparranging adding \
-    comment stopoverlay setuplinenumbering items stopbackground setupprograms \
-    placeontopofeachother appendix setuppublications characters setupsynchronizationbar nolist \
-    tex startdescription stopcolor name setupitemgroup fieldstack \
-    wordright settextvariable setupoutput stopfact definereferenceformat setupfootnotes \
-    startpositioning clip setupcaption startlegend followprofileversion stopdescription \
-    startalignment setuphead setupsynchronization setupstrut usedirectory setupmarginrules \
-    defineblock setupitems WORD startformula inothermargin showpalet \
-    stoppostponing startframedtext placelogos quote setupcombinations stopenumeration \
-    usespecials usesymbols startnarrower head startsynchronization adaptlayout \
-    setuptextposition inleft definefiguresymbol gotobox crlf setupfootnotedefinition \
-    startpostponing setupbackground placesubformula showprint WEEKDAY defineversion \
-    hl setupcaptions definerule setupfillinlines thinrules startoverlay \
-    setuptextvariable showframe forceblocks useexternalsoundtrack setuplist loadsynonyms \
-    notopandbottomlines setupblock defineinteractionmenu thinrule setupregister cap \
-    hideblocks setupfillinrules setupheader startsymbolset writebetweenlist definelabel \
-    overbar comparepalet setuppositioning reservefloat from showbodyfont \
-    stopalignment language define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+     startcommento startcolore notapdp definiscielenco impostatestifondo \
+    impostaoggettimobili impostacombinazioni nientelineecimafondo usablocco spaziobianco bastablocchi \
+    impostadescrizioni reimpostamarcatura definiscienumerazione frazione sincronizza griglia \
+    scriviinregistro impostabloccosezione impostapdp chim testoinstestazioni impostarigovuoto \
+    impostatab ruota impostamaiuscole sopralinee vaia logcampi \
+    impostafontdeltesto impostapulsanti placefloat impostacolori marcatura typebuffer \
+    impostainmargine definiscirientro daqualcheparte definiscisottocampo lettera impostadefinizionenotepdp \
+    impostasinonimi accoppiacarta impostamakeup usafiguraesterna nientespazio definiscicampo \
+    seguiprofilo impostatesto arg elemento impostaoutput definiscifont \
+    definiscitestoincorniciato in definiscilinea impostatesticima definiscielencocombinato bastafile \
+    data definiscirigovuoto impostatabulato impostaurl definiscilistariferimenti impostatype \
+    type circondato marcaversione impostaspaziobianco mettisegnalibro citazione \
+    impostacolore impostaversioni tooltip stopversione impostafigureesterne impostalegenda \
+    impostatestiincorniciati usasimboli copiacampo mettiformula nientelineintestazionepdp lineesottili \
+    spostaagriglia impostainterazione definiscimakeup vaiabox stopimpaccato impostarigheriempimento \
+    definisci definisciconversione incorniciato impostasottolinea lineanera impostatestoetichette \
+    inaltromargine numerotesta definiscisovrapposizione impostaelencocombinato variabiletesto programma \
+    impostatyping qualcheriga allineacentro menzione usariferimenti Parole \
+    selezionacarta ran mostraimpostazioni camporiempimento elaborapagina PAROLA \
+    impaccato scriviinlistariferimenti impostanumerazione usadocumentoesterno indestra al \
+    impostacampo campi mostracornice nienterientro definiscifontgrezzo definisciincorniciato \
+    impostaclippling definiscicapoversi forzablocchi convertinumero impostaspaziatura prendibuffer \
+    pulsantinterazione impostaordinamento ininner rientro mostramakeup impostamenzione \
+    versione impostaspezzamentooggettomobile testoetichetta tipopagina impostaincorniciato typ \
+    impostacaption impostatesta typefile sbarrato Lettera impostanumerazionecapoversi \
+    cambiaafontdeltesto impostamarcatura usaspecialita mettiingriglia apagina mostrastampa \
+    impostasfondo numerotestacorrente mettielenco impostalineemargine mettiloghi mostracampi \
+    sim disabilitamenuinterazione definiscimarcatura impostalineetesto nientemarcatura impostabarrasincronizzazione \
+    barrainterazione nientespaziobianco definisciriferimento impostapiustretto definisciformatoriferimento saltablocchi \
+    startcomponenet commento pubblicazione vaigiu lineasottile scriviinelenco \
+    passaafontgrezzo Lettere schermo impostatestotesti usaURL emptylines \
+    nop lettere startlineatesto impostariferimento impostalinea inmargine \
+    tab listsymbol stopcolore definiscivariabiletesto selezionaversione rigovuoto \
+    adattalayout impostacolonne seguiversioneprofilo fondo riferimentotesto numeri \
+    mettinotepdplocali correggispaziobianco adding clonacampo colonna impostablocco \
+    impostaelementi da impostatransizionepagina impostanumerosottopagina impostarighe elementi \
+    riferimento tieniblocchi numeriromani startfatto tex paroladestra \
+    impostacapoversi startlineamargine impostalineeriempimento definiscicolore notest sottolinea \
+    mettilistariferimenti setupitemgroup accoppiadocumento elaborablocchi definiscidimensionicarta usacomandi \
+    definisciambientefontdeltesto determinacarattersticheelenco nota start mettivariabiletesto impostalistariferimenti \
+    matematica impostasistema definiscitesto definisciposizionetesto impostaoggettomobile impostabarrainterazione \
+    scala stopfatto definiscietichetta clip usafileesterni completeregister \
+    impostatavolozza impostaallineamento impostaprofili mettielencocombinato impostacaptions impostaforms \
+    impostaprogrammi spezzaoggettomobile mostrastruts impostarientri adattacampo MESE \
+    stopprogetto mostrafontdeltesto testonotapdp lingua coloregrigio pedap \
+    figuraesterna definiscibuffer mostragruppocolori impostanotepdp usacodifica definisciordinamento \
+    mostratavolozza mese PAROLE intorno startversione setuppaper \
+    etichette mettifiancoafianco impostasegnosillabazione impostaposizionetesto definiscifontdeltesto scrividentroelenco \
+    crlf separamarcatura impostalineesottili datareferral rigariempimento stopsfondo \
+    simbolo rif definiscisinonimi ped definiscimenuinterazione posizione \
+    impostarientro inriga definisciregistro stoplineatesto hl definiscitesta \
+    stopcommento segnalibro mostrafiguresterne startimpaccato stopcomponenet accoppiaregistro \
+    linguaprincipale impostalingua installalingua stopcitazione mostracolore mostrasetsimboli \
+    impostaenumerazioni impostacommento allineasinistra selezionablocchi impostaregistro startsfondo \
+    impostasincronizzazione definisciiniziatermina pulsante impostaposizionamento posizionatesto impostaampiezzariga \
+    lineamargine impostatestointestazioni impostatestipdp impostatestiintestazioni startmenuinterattivo riferimentopagina \
+    impostanumerazionerighe impostainstestazione impostasezione sopralinea mettilinea seguiversione \
+    impostainterlinea definisciversion stopambiente impostapubblicazioni mostraambientefontdeltesto definiscistackcampi \
+    reimposta mettiunosullaltro definisciprogramma testoinmargine lineatesto lineeriempimento \
+    stackcampi ap startprogetto inouter mostragriglia testa \
+    definiscigruppocolori definiscidescrizione allineadestra Parola impostavariabiletesto definiscibloccosezione \
+    usamodulo Numeriromani startambiente capello definiscitabulato impostatolleranza \
+    impostaelenco stopmenuinterattivo impostablocchimargine riflessione definiscitype impostaparranging \
+    impostanumeropagina datadioggi sfondo nienteelenco definiscisimbolo determinanumerotesta \
+    usafileesterno definiscioggettomobile definisciblocco colore definiscityping impostalayout \
+    lineenere GIORNOSETTIMANA definiscioutput impostacima vl punti \
+    mostralyout definiscilogo confrontagruppocolori mettisottoformula impostabuffer prendimarcatura \
+    impostalineenere impostacampi mettinotepdp sottolinee impostasetsimboli spazio \
+    barrasincronizzazione stoplineamargine impostatabelle mar definiscitavolozza impostasfondi \
+    usacolonnasonoraesterna impostaambientefontdeltesto referral insinistra impostarotazione impostanumerotesta \
+    definisciprofilo nascondiblocchi accoppiapagina traduci testoriempimento pagina \
+    mettilegenda spazifissi setvariabiletesto stirato sbarrati impostafondo \
+    impostaschermointerazione definiscimodellotabella impostaposizionamentoopposti impostaschermi startcitazione giornosettimana \
+    impostadimensionicarta definiscisezione stop confrontatavolozza impostastrut impostateste \
+    definiscifigurasimbolo impostanumerazionepagina accoppiamarcatura mettiregistro el 
diff --git a/context/data/cont-nl-scite.properties b/context/data/cont-nl-scite.properties
index 1d0e07d17..e22bae5b9 100644
--- a/context/data/cont-nl-scite.properties
+++ b/context/data/cont-nl-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.nl=\
-    date underbar setuplinewidth disableinteractionmenu margintext stoptable \
-    setuplegend definepapersize interactionbar pagereference subject MONTH \
-    setuprotate placerule setupbuttons title setupcombinedlist stopenvironment \
-    stopnamemakeup keepblocks mirror labeltext month setuptyping \
-    fraction startcomponent setupquote someline coupledocument positiontext \
-    setupclipping setuptolerance seeregister typebuffer part background \
-    nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline startparagraph \
-    in startquotation inline stopfigure stoplocalfootnotes Words \
-    setupfloat type definetextposition stopcolumns setupsectionblock tooltip \
-    overbars goto fixedspaces grid stophiding defineregister \
-    stopopposite fillinline note stopproduct definebodyfontenvironment startoverview \
-    setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist decouplemarking \
-    placereferencelist definefont overstrike startbuffer numbers selectversion \
-    definefieldstack ran nospace stopsynchronization ref stopnarrower \
-    stopunpacked description setupinterlinespace setuptoptexts couplepaper placecombinedlist \
-    writetolist defineparagraphs setupblackrules setupinteractionscreen stopquotation typ \
-    labeling romannumerals weekday useexternalfiles setuptexttexts completelistofsorts \
-    marking definetextvariable screen definetabulate defineindenting showsymbolset \
-    stoplegend stoptabulate setupformulae item leftaligned about \
-    stoplocalenvironment column setupcolor definereference placefootnotes startline \
-    stopframedtext setupalign scale placeformula startcomment emptylines \
-    placeregister sym followversion setupoppositeplacing stopbuffer setupcapitals \
-    setupinteractionbar tab setuppagetransitions listsymbol copyfield comparecolorgroup \
-    startdocument subsubject Cap writetoregister setupsystem stopcomment \
-    splitfloat setupframed placelistofsynonyms setupfloatsplitting textreference setupfootertexts \
-    setupsorting clonefield setupdescriptions setupbuffer definesubfield stoplinecorrection \
-    blackrule setupinteraction followprofile definetype setupheads inmargin \
-    starttextrule fillintext synonym translate setupmarginblocks startbackground \
-    but Character stopinteractionmenu fitfield useexternalfile startfigure \
-    chem setuplabeltext referraldate setupmarking setupreferencing color \
-    completeregister donttest setuptables nomoreblocks setupcomment sort \
-    bookmark startlinecorrection setupversions startcombination startregister showgrid \
-    CAP definesorting setupfields setupmakeup determinelistcharacteristics lohi \
-    subsubsection stoptables definereferencelist godown setuppaper setupsymbolset \
-    installlanguage startopmaak setuptop setupparagraphs setupscreens pagetype \
-    startcolor framed position stopitemgroup setupthinrules synchronize \
-    low setupbodyfont underbars startfloattext setuptext footnote \
-    defineprogram button defineframed placelist definebodyfont externalfigure \
-    completelistoffloats couplepage setupheadertexts setuppapersize definestartstop processblocks \
-    its stoplinenumbering enumeration stopmarginrule setuplanguage startversion \
-    definelogo inouter packed definetyping stopmarginblock setupparagraphnumbering \
-    definepalet inframed atpage stopline stoppacked placebookmarks \
-    setupframedtexts couplemarking startcolumns currentheadnumber useblocks whitespace \
-    page defineoverlay subsubsubject definerawfont inright setuppagenumbering \
-    field stopformula switchtobodyfont graycolor setuptab definecolorgroup \
-    startunpacked completelistofsynonyms stopparagraph definefloat reset defineprofile \
-    Characters useencoding rightaligned setupfooter defineoutput midaligned \
-    interactionbuttons space setupenumerations nowhitespace resetmarking showmakeup \
-    indentation stopprofile noheaderandfooterlines getbuffer nocap chapter \
-    stoptyping program currentdate marginrule definesynonyms Romannumerals \
-    nomarking stopcomponent symbol WORDS setupindentations definetext \
-    rotate setupinmargin setupblank completecombinedlist stopversion stoppositioning \
-    setupnarrower placeongrid definemarking definesection periods loadsorts \
-    definetabletemplate placefloat startinteractionmenu version defineenumeration showexternalfigures \
-    switchtorawfont startitemgroup starttyping setupwhitespace paragraph arg \
-    placesidebyside setupindenting showcolor startproduct showcolorgroup setupbackgrounds \
-    setuptextrules setupbottom selectblocks logfields startmarginrule processpage \
-    stoplokale definehead publication startopposite stoptextrule definecolor \
-    indenting textrule moveongrid defineframedtext startpacked stopfloattext \
-    setupforms register setupbottomtexts placelegend determineheadnumber nextsection \
-    placelistoffloats startnamemakeup setupurl headtext defineconversion usecommands \
-    correctwhitespace setupexternalfigures quotation setupfield setupsynonyms definedescription \
-    definesectionblock ininner definebuffer section stretched startmarginblock \
-    setupspacing coupledregister definemakeup startprofile starttabulate typefile \
-    stopcombination useexternalfigure startfact startenumeration showstruts setuptabulate \
-    fillinrules placelistofsorts noindenting stopoverview footnotetext definefield \
-    markversion convertnumber setuprule blackrules subsection blank \
-    Word setupnumbering fillinfield character textvariable defineblank \
-    bypassblocks setupreferencelist usemodule nop starttable starttables \
-    showsetups framedtext reference labels stopdocument setupcolors \
-    startenvironment starthiding setuparranging adding comment stopoverlay \
-    setuplinenumbering items stopbackground setupprograms placeontopofeachother appendix \
-    setuppublications characters setupsynchronizationbar nolist tex startdescription \
-    stopcolor name setupitemgroup fieldstack wordright settextvariable \
-    setupoutput stopfact definereferenceformat setupfootnotes startpositioning clip \
-    setupcaption startlegend followprofileversion stopdescription startalignment setuphead \
-    setupsynchronization setupstrut usedirectory setupmarginrules defineblock setupitems \
-    WORD startformula inothermargin showpalet stoppostponing startframedtext \
-    placelogos quote setupcombinations stopenumeration usespecials usesymbols \
-    startnarrower head startsynchronization adaptlayout setuptextposition inleft \
-    definefiguresymbol gotobox crlf setupfootnotedefinition startpostponing setupbackground \
-    placesubformula showprint WEEKDAY defineversion hl stopopmaak \
-    setupcaptions definerule setupfillinlines thinrules startoverlay setuptextvariable \
-    showframe forceblocks useexternalsoundtrack setuplist loadsynonyms notopandbottomlines \
-    setupblock defineinteractionmenu thinrule setupregister cap hideblocks \
-    setupfillinrules setupheader startsymbolset writebetweenlist definelabel overbar \
-    comparepalet setuppositioning reservefloat from showbodyfont stopalignment \
-    language startlokale define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+    stopachtergrond stopkantlijn stelkapitalenin  hoog voetnoottekst \
+    plaatstekstvariabele stelsynchronisatiein startgeg hoofdtaal rooster plaatslijst \
+    koppelpagina WEEKDAG gebruikspecials letter definieerplaatsblok stelpaginanummerin \
+    stelinmargein passendveld uitgerekt stelpublicatiesin stelsamengesteldelijstin geenhoofdenvoetregels \
+    tooninstellingen gebruikexternefiles stelreferentielijstin plaatslegenda steltekstin Letter \
+    uit regelrechts stelblokin stelhoofdtekstenin markeerversie citeer \
+    breuk naarbox symbool definieertabelvorm invullijnen soortpagina \
+    kenmerkdatum koppeldocument definieerkorps geenlijst typebuffer haalbuffer \
+    kleur plaatsreferentielijst stelcombinatiesin definieeralineas stelmarkeringin switchtorawfont \
+    commentaar definieerprogramma invulregel stelachtergrondin arg stellegendain \
+    witruimte stelkoppenin stelvoetin tekstlijn WOORD referentie \
+    in definieerpapierformaat inspringen gebruikexterngeluidsfragment stelteksttekstenin stelkolommenin \
+    onderstrepen definieertekstvariabele wiskunde installeertaal steltypein type \
+    positioneertekst steldunnelijnenin Romeins stelformulierenin bepaallijstkenmerken oppagina \
+    definieerstartstop inrechter koptekst starttekstlijn stelalineasin koppelmarkering \
+    regelmidden startcitaat stelkoptekstin passeerblokken kopnummer definieerreferentielijst \
+    citaat synchroniseer stelboventekstenin stelvoettekstenin achtergrond definieeropmaak \
+    WOORDEN plaatsplaatsblok stelregelsin definieertabulatie stelmargeblokkenin stelprogrammasin \
+    stelvoetnotenin Woord stellabeltekstin programma gebruikexternefile paslayoutaan \
+    haalmarkering switchnaarkorps stelpositionerenin taal definieersymbool ran \
+    tekstvariabele schrijfnaarregister gebruikexternfiguur stelpaletin inbinnen dunnelijn \
+    ref Woorden stelomlijndin stelpaginanummeringin stelciterenin registreervelden \
+    woordrechts publicatie stelblokkopjesin volgprofielversie startversie toonkleurgroep \
+    startopelkaar haarlijn definieeruitvoer overstreep stelkadertekstenin geentest \
+    invulveld stopopelkaar overstrepen steltabin volgversie stoptekstlijn \
+    stelkopin definieerblanko typ omlijnd grijskleur typefile \
+    nietinspringen stelhoofdin definieerkleur stelplaatsbloksplitsenin geenmarkering selecteerblokken \
+    definieersorteren stelveldin stelkoppeltekenin onderstreep plaatsvoetnoten romeins \
+    usecodering stelspatieringin stelsynchronisatiebalkin verbergblokken stelonderin stelopmaakin \
+    stelpapierformaatin about plaatsformule definieerkop stelkleurin steltaalin \
+    stelsysteemin stelstrutin definieeromlijnd steltekstvariabelein stellijnin synchronisatiebalk \
+    stelinteractiebalkin stelregisterin Letters stopversie verwerkpagina markeer \
+    noot steluitvoerin inmarge nop sym schrijftussenlijst \
+    startonderdeel stelbovenin definieertekst steldoordefinierenin definieerkadertekst definieermarkering \
+    steltabulatiein inregel tab stelsectiein stelblokkopjein blokjes \
+    toongrid labels stopcommentaar plaatsnaastelkaar stelsynoniemenin stelblokjesin \
+    eenregel definieertypen regellinks splitsplaatsblok definieersectieblok stelitemsin \
+    gebruikreferenties stopcitaat bepaalkopnummer copieerveld items stelwitruimtein \
+    ergens kolom som stelinterliniein stelinvulregelsin MAAND \
+    plaatsopgrid vergelijkkleurgroep definieerreferentie blanko steltekstpositiein stelkorpsomgevingin \
+    stelkantlijnin stelachtergrondenin tex converteernummer plaatssubformule vastespaties \
+    definieerlijst plaatslijn stelondertekstenin stelnummerenin stelplaatsblokin definieer \
+    but startachtergrond versie start doorstrepen gebruikmodule \
+    margetekst toonlayout chem definieerbuffer definieerconversie gebruikexterndocument \
+    stopkleur doorlabelen geenwitruimte inlijnd clip startomgeving \
+    suggestie gebruikblokken definieerveldstapel stelsorterenin stopgeg steltypenin \
+    startkantlijn plaatslokalevoetnoten opelkaar volledigregister definieersectie ontkoppelmarkering \
+    startinteractiemenu kantlijn blokkeerinteractiemenu positioneer definieertype bookmark \
+    selecteerpapier stelinvullijnenin inlinker gebruikURL toonkorps stelcommentaarin \
+    toonpalet veld stelitemgroepin stelonderstrepenin cijfers toonvelden \
+    naar stelveldenin labeltekst forceerblokken stellayoutin doordefinieren \
+    interactiebalk crlf kentekstvariabeletoe steltolerantiein datum geenfilesmeer \
+    definieerveld toonkleur omlaag plaatsonderelkaar toonkader koppelpapier \
+    laho hl weekdag stopomgeving doorstreep stelprofielenin \
+    stelsubpaginanummerin definieersynoniemen definieerregister letters definieerfiguursymbool laag \
+    button koppelregister inbuiten stoponderdeel stelrastersin stelrefererenin \
+    definieerblok spatie interactiebuttons stelkleurenin definieerlijn stelinteractieschermin \
+    stelclipin volgprofiel geenspatie stelroterenin stelurlin definieerinteractiemenu \
+    its toevoegen inanderemarge stelbufferin stelkorpsin definieerfont \
+    steluitlijnenin geenbovenenonderregels stelregelnummerenin kloonveld plaatsbeeldmerken externfiguur \
+    lijstsymbool spiegel stelnaastplaatsenin steldoornummerenin invultekst stelinspringenin \
+    gebruikcommandos toonkorpsomgeving corrigeerwitruimte toonexternefiguren stelplaatsblokkenin stelblankoin \
+    resetmarkering stelparagraafnummerenin stelbuttonsin scherm kenmerk plaatssamengesteldelijst \
+    stopinteractiemenu roteer huidigekopnummer definieerkleurgroep doornummeren stelpaginaovergangenin \
+    stelsectieblokin plaatsbookmarks verwerkblokken vl startproject kop \
+    doorspringen definerawfont toonprint toonsymboolset definieerreferentieformaat tekstreferentie \
+    definieerversie definieerbeeldmerk stopproject stelversiesin stelexternefigurenin handhaafblokken \
+    mar stelkopnummerin steltekstlijnenin voetnoot startcommentaar definieerpalet \
+    verplaatsopgrid paginareferentie steltabellenin op gebruiksymbolen legeregels \
+    pagina definieertekstpositie stelarrangerenin toonstruts geenblokkenmeer blokje \
+    stelvoetnootdefinitiein punten stelinteractiein reset stelsymboolsetin toonopmaak \
+    definieersamengesteldelijst plaatsregister veldstapel stellijndiktein stelpapierin startkleur \
+    stop schrijfnaarlijst vertaal stelsmallerin selecteerversie steldoorspringenin \
+    huidigedatum definieeroverlay definieerkorpsomgeving vergelijkpalet schaal stellijstin \
+    definieersubveld maand definieerprofiel dunnelijnen schrijfnaarreferentielijst 
diff --git a/context/data/cont-ro-scite.properties b/context/data/cont-ro-scite.properties
index d0f403935..0af6e5ebb 100644
--- a/context/data/cont-ro-scite.properties
+++ b/context/data/cont-ro-scite.properties
@@ -1,96 +1,76 @@
 keywordclass.macros.context.ro=\
-    date underbar setuplinewidth disableinteractionmenu margintext stoptable \
-    setuplegend stoplocal definepapersize interactionbar pagereference subject \
-    MONTH setuprotate placerule setupbuttons title setupcombinedlist \
-    stopenvironment stopnamemakeup keepblocks mirror labeltext month \
-    setuptyping fraction startcomponent setupquote someline coupledocument \
-    positiontext setupclipping setuptolerance seeregister typebuffer part \
-    background nomorefiles setuplines setupsubpagenumber setuphyphenmark hairline \
-    startparagraph in startquotation inline stopfigure stoplocalfootnotes \
-    Words setupfloat type definetextposition stopcolumns setupsectionblock \
-    tooltip overbars goto fixedspaces grid stophiding \
-    defineregister stopopposite fillinline note stopproduct definebodyfontenvironment \
-    startoverview setuppagenumber setupunderbar overstrikes definecombinedlist writetoreferencelist \
-    decouplemarking placereferencelist definefont overstrike startbuffer numbers \
-    selectversion startlocal definefieldstack ran nospace stopsynchronization \
-    ref stopnarrower stopunpacked description setupinterlinespace setuptoptexts \
-    couplepaper placecombinedlist writetolist defineparagraphs setupblackrules setupinteractionscreen \
-    stopquotation typ labeling romannumerals weekday useexternalfiles \
-    setuptexttexts completelistofsorts marking definetextvariable screen definetabulate \
-    defineindenting showsymbolset stoplegend stoptabulate setupformulae item \
-    leftaligned about stoplocalenvironment column setupcolor definereference \
-    placefootnotes startline stopframedtext setupalign scale placeformula \
-    startcomment emptylines placeregister sym followversion setupoppositeplacing \
-    stopbuffer setupcapitals setupinteractionbar tab setuppagetransitions listsymbol \
-    copyfield comparecolorgroup startdocument subsubject Cap writetoregister \
-    setupsystem stopcomment splitfloat setupframed placelistofsynonyms setupfloatsplitting \
-    textreference setupfootertexts setupsorting clonefield setupdescriptions setupbuffer \
-    definesubfield stoplinecorrection blackrule setupinteraction followprofile definetype \
-    setupheads inmargin starttextrule fillintext stopmakeup synonym \
-    translate setupmarginblocks startbackground but Character stopinteractionmenu \
-    fitfield useexternalfile startfigure chem setuplabeltext referraldate \
-    setupmarking setupreferencing color completeregister donttest setuptables \
-    nomoreblocks startmakeup setupcomment sort bookmark startlinecorrection \
-    setupversions startcombination startregister showgrid CAP definesorting \
-    setupfields setupmakeup determinelistcharacteristics lohi subsubsection stoptables \
-    definereferencelist godown setuppaper setupsymbolset installlanguage setuptop \
-    setupparagraphs setupscreens pagetype startcolor framed position \
-    stopitemgroup setupthinrules synchronize low setupbodyfont underbars \
-    startfloattext setuptext footnote defineprogram button defineframed \
-    placelist definebodyfont externalfigure completelistoffloats couplepage setupheadertexts \
-    setuppapersize definestartstop processblocks its stoplinenumbering enumeration \
-    stopmarginrule setuplanguage startversion definelogo inouter packed \
-    definetyping stopmarginblock setupparagraphnumbering definepalet inframed atpage \
-    stopline stoppacked placebookmarks setupframedtexts couplemarking startcolumns \
-    currentheadnumber useblocks whitespace page defineoverlay subsubsubject \
-    definerawfont inright setuppagenumbering field stopformula switchtobodyfont \
-    graycolor setuptab definecolorgroup startunpacked completelistofsynonyms stopparagraph \
-    definefloat reset defineprofile Characters useencoding rightaligned \
-    setupfooter defineoutput midaligned interactionbuttons space setupenumerations \
-    nowhitespace resetmarking showmakeup indentation stopprofile noheaderandfooterlines \
-    getbuffer nocap chapter stoptyping program currentdate \
-    marginrule definesynonyms Romannumerals nomarking stopcomponent symbol \
-    WORDS setupindentations definetext rotate setupinmargin setupblank \
-    completecombinedlist stopversion stoppositioning setupnarrower placeongrid definemarking \
-    definesection periods loadsorts definetabletemplate placefloat startinteractionmenu \
-    version defineenumeration showexternalfigures switchtorawfont startitemgroup starttyping \
-    setupwhitespace paragraph arg placesidebyside setupindenting showcolor \
-    startproduct showcolorgroup setupbackgrounds setuptextrules setupbottom selectblocks \
-    logfields startmarginrule processpage definehead publication startopposite \
-    stoptextrule definecolor indenting textrule moveongrid defineframedtext \
-    startpacked stopfloattext setupforms register setupbottomtexts placelegend \
-    determineheadnumber nextsection placelistoffloats startnamemakeup setupurl headtext \
-    defineconversion usecommands correctwhitespace setupexternalfigures quotation setupfield \
-    setupsynonyms definedescription definesectionblock ininner definebuffer section \
-    stretched startmarginblock setupspacing coupledregister definemakeup startprofile \
-    starttabulate typefile stopcombination useexternalfigure startfact startenumeration \
-    showstruts setuptabulate fillinrules placelistofsorts noindenting stopoverview \
-    footnotetext definefield markversion convertnumber setuprule blackrules \
-    subsection blank Word setupnumbering fillinfield character \
-    textvariable defineblank bypassblocks setupreferencelist usemodule nop \
-    starttable starttables showsetups framedtext reference labels \
-    stopdocument setupcolors startenvironment starthiding setuparranging adding \
-    comment stopoverlay setuplinenumbering items stopbackground setupprograms \
-    placeontopofeachother appendix setuppublications characters setupsynchronizationbar nolist \
-    tex startdescription stopcolor name setupitemgroup fieldstack \
-    wordright settextvariable setupoutput stopfact definereferenceformat setupfootnotes \
-    startpositioning clip setupcaption startlegend followprofileversion stopdescription \
-    startalignment setuphead setupsynchronization setupstrut usedirectory setupmarginrules \
-    defineblock setupitems WORD startformula inothermargin showpalet \
-    stoppostponing startframedtext placelogos quote setupcombinations stopenumeration \
-    usespecials usesymbols startnarrower head startsynchronization adaptlayout \
-    setuptextposition inleft definefiguresymbol gotobox crlf setupfootnotedefinition \
-    startpostponing setupbackground placesubformula showprint WEEKDAY defineversion \
-    hl setupcaptions definerule setupfillinlines thinrules startoverlay \
-    setuptextvariable showframe forceblocks useexternalsoundtrack setuplist loadsynonyms \
-    notopandbottomlines setupblock defineinteractionmenu thinrule setupregister cap \
-    hideblocks setupfillinrules setupheader startsymbolset writebetweenlist definelabel \
-    overbar comparepalet setuppositioning reservefloat from showbodyfont \
-    stopalignment language define useexternaldocument stopsymbolset Caps \
-    stoplines setupfloats usereferences setupbodyfontenvironment definelist synchronizationbar \
-    placelocalfootnotes vl startproject mathematics showbodyfontenvironment showfields \
-    stopproject startlocalenvironment mar startlocalfootnotes setuppalet referral \
-    useURL coupleregister setupheadnumber setupsection setuplayout high \
-    definesymbol mainlanguage at startlines mediaeval selectpaper \
-    getmarking setuptype setupcolumns placetextvariable setupheadtext showlayout \
-    startlinenumbering sub setupprofiles somewhere headnumber 
+     definestesubcamp definestepozitietext seteazasortare seteazaurl program \
+    seteazafloat plaseazapegrid afiseazasetari scriebuffer adapteazaaspect definestefont \
+    intins faraaliniat linieneagra definesteenumerare textumplere seteazatexteantet \
+    limbaprincipala startmeniuinteractiune faraspatiualb seteazafloats seteazaaliniate seteazatextejos \
+    startversiune seteazamajuscule seteazaalinierea punevariabilatext fundal startfundal \
+    copiazacamp folosestespeciale punenotesubsol textmarginal faraliniisussijos zidinsaptamana \
+    semncarte definestemediulfonttext placefloat ecran cupleazaregistru blanc \
+    seteazaparagrafe seteazablanc stopmeniuinteractiune definestevariabilatext liniipeste seteazatabulatori \
+    definestelistacombinata seteazaimpartireafloat folosestemuzicaexterna stivacampuri punedeasuprafiecareia seteazaspatiualb \
+    startcomentariu minicitat farafisiere punerigla puneformula arg \
+    roteste cloneazacamp seteazatitluri urmeazaversiuneprofil in paginadubla \
+    liniepeste trecilafontraw gatablocuri definestemeniuinteractiune scrieinlista afiseazarama \
+    Litera data stopfundal seteazarigla seteazafundaluri folosestesimboluri \
+    litere numereromane seteazadefinireanotasubsol type faraliniiantetsisubsol startliniemargine \
+    buton seteazaecraninteractiune linieumplere potrivestecamp tooltip limba \
+    determinacaracteristicilelistei CUVANT startcomponenta Cuvant definestetextinconjurat seteazagrosimelinie \
+    grid stopversiune definestefonttext aliniatcentru startimpachetat definesteblocsectiune \
+    supralinie defineste seteazafonttext seteazainconjurat texttitlu Cuvinte \
+    definesteblanc liniinegre trecilafonttext seteazalegenda ran seteazamarcaje \
+    afiseazapaleta variabilatext ref seteazaspatiuinterliniar referintatext selecteazablocuri \
+    element marginal reflexie seteazapublicatii publicatie setaresincronizare \
+    afiseazagrupculoare definestesimbol butoaneinteractiune seteazarotare litera seteazabarainteractiune \
+    ininner seteazaaliniat culoaregri startriglatext undeva stopculoare \
+    typ seteazacomentariu numartitlu definesteformatreferinte definestedimensiunehartie definestestartstop \
+    typefile definesteparagraf definestepaleta setareoutput startfact decupleazamarcaje \
+    seteazanumarpagina scrieinlistareferinte afiseazatiparire seteazanumerotare barainteractiune instalarelimba \
+    definestefloat seteazabuffer seteazapaleta LUNA rigleumplere sim \
+    reseteazamarcaje seteazastrut definesteantet CUVINTE definesteculoare despre \
+    footnotetext setarebarasincronizare simbol definestestivacampuri definesteversiune seteazanumerotarelinii \
+    logcampuri marcaje stopcitat inlinie punelistacombinata afiseazastruts \
+    seteazasectiune seteazablocsectiune stopproiect sublinie seteazamediulfonttext barasincronizare \
+    referinta selecteazaversiune punefatainfata puncte seteazasublinie nutesta \
+    definesteeticheta emptylines nop seteazatext jossus firdepar \
+    stopmediu definestealiat definesteinconjurare definestetyping definestelistareferinte tab \
+    sublinii seteazatextesubsol definestetexteinconjurate listsymbol dezactiveazameniuinteractiune liniesubtire \
+    seteazaaspect sincronizeaza faralista notasubsol startcitat Numereromane \
+    ZIDINSAPTAMANA definestetabulatori seteazabutoane saripesteblocuri seteazaingust definestesortare \
+    seteazaplasareaopozita setvariabilatext definestefontraw seteazamakeup olinie seteazaliniesilabe \
+    seteazasistem instanga indreapta adubuffer stopcomentariu seteazanumerotareparagrafe \
+    folosestebloc stopriglatext seteazadescriere seteazacamp tex cuvantdreapta \
+    seteazasus pastreazablocuri datacurenta seteazalista definetype seteazalistareferinte \
+    setupitemgroup seteazacoloane lapagina but seteazaaranjareapag nota \
+    start injos definesteoverlay faramarcaje chem matematica \
+    stopfact selecteazahartie convertestenumar scala startmediu referit \
+    la seteazaantet clip completeregister folosestefisierextern inalt \
+    impachetat definestereferinte liniemargine seteazaclipping seteazatoleranta etichete \
+    determinanumartitlu marcheazaversiune definestegrupculori adauga seteazaregistru seteazajos \
+    definestedescriere punelegenda afiseazagrid citat setarelimba seteazatranzitiepagina \
+    fractie definesteprogram seteazaliniimargine camp dute seteazatabele \
+    puneregistru setuppaper seteazaculoare cupleazadocument numartitlucurent stopliniemargine \
+    cupleazamarcaje seteazacombinari campumplere seteazaliniesubtire seteazalinii definestebloc \
+    crlf framed folosestecodificarea afiseazasetsimboluri seteazaversiuni plaseazasemnecarte \
+    seteazanotasubsol definesterigla definestesablontabel versiune startproiect hl \
+    folosestereferinte dutebox definesteoutput seteazatitlu inaltamargine seteazasubsol \
+    folosestefiguraexterna seteazalegendele seteazasinonime texteticheta afiseazaaspect seteazatab \
+    datareferit definestelogo mutapegrid aliniat spatiu seteazaprofile \
+    definestelista coloana definesteprofil referintapagina seteazafundal seteazablocurimarginale \
+    definestesinonim luna seteazarigletext seteazatexttitlu proceseazapagina seteazatyping \
+    definestebuffer seteazaliniinegre seteazatexteticheta afiseazafonttext pozitietext seteazaformulare \
+    seteazacampuri afiseazaculoare jos definesteconversie startculoare impartefloat \
+    titlu stopimpachetat punelista seteazaspatiu inouter adumarcaje \
+    punelogouri seteazasimbol seteazabloc definestesimbolfigura urmeazaprofil barasus \
+    seteazanumerotarepagina seteazaculori hartiedubla inframed seteazatype aliniatdreapta \
+    seteazadimensiunihartie faraspatiu seteazafiguriexterne folosestefisiereexterne definestemakeup traduce \
+    seteazaenumerare afiseazafiguriexterne spatiualb scrieintreliste numere seteazapozitietext \
+    seteazaliniiumplere ascundeblocuri spatiifixate vl scrieinregistru punelistareferinte \
+    seteazainteractiunea afiseazacampuri pozitie stopcomponenta setarepozitie punenotesubsollocale \
+    tippagina seteazareferinte forteazablocuri comparapaleta seteazatextesus folosesteURL \
+    definesteregistru definestesectiune seteazavariabilatext seteazaminicitat folosestedocumentextern mar \
+    culoare figuraexterna riglatext seteazanumarsubpagina proceseazabloc din \
+    seteazaecrane seteazaelemente pagina seteazatextetext seteazamarginal comentariu \
+    seteazaprograme punesubformula folosestemodul liniisubtiri folosestecomenzi reset \
+    definestemarcaje comparagrupculoare aliniatstanga seteazalistacombinata seteazarigleumplere stop \
+    Litere definestecamp corecteazaspatiualb afiseazamakeup seteazanumartitlu el \
+    afiseazamediufonttext urmeazaversiune definestetext 
diff --git a/scripts/context/perl/texutil.pl b/scripts/context/perl/texutil.pl
index fa3f78919..31c5c1874 100644
--- a/scripts/context/perl/texutil.pl
+++ b/scripts/context/perl/texutil.pl
@@ -2816,34 +2816,40 @@ sub FilterPages # temp feature / no reporting
        close(TUO) } }
 
 sub GenerateSciteApi # ugly, not generic, but fast, will become xsltproc based
-  { my $filename = $ARGV[0] ;
+  { my $interface = $ARGV[0] ;
     my $commands = 0 ;
     my $environments = 0 ;
     my %collection ;
-    return unless -f "$filename.xml" ;
-    print "        scite api file : $filename-scite.api\n" ;
-    print "      scite lexer file : $filename-scite.properties\n" ;
-    if (open(XML,"<$filename.xml"))
+    my %mappings ;
+    return unless -f "cont-en.xml" ;
+    print "        scite api file : cont-$interface-scite.api\n" ;
+    print "      scite lexer file : cont-$interface-scite.properties\n" ;
+    if (open(XML,"<keys-$interface.xml"))
+      { while (<XML>)
+          { if (/\<cd\:command\s+name=\"(.*?)\"\s+value=\"(.*?)\".*?\>/o)
+              { $mappings{"$1"} = $2 } }
+        close(XML) }
+    else
+      { print "          missing file : keys-$interface.xml\n" ;
+        return }
+    if (open(XML,"<cont-en.xml"))
       { while (<XML>)
           { chomp ;
             if (/\<cd\:command\s+name=\"(.*?)\"\s+type=\"environment\".*?\>/o)
               { $environments++ ;
-                $collection{"start$1"} = '' ;
-                $collection{"stop$1"} = '' }
+                $collection{"start$mappings{$1}"} = '' ;
+                $collection{"stop$mappings{$1}"} = '' }
             elsif (/\<cd\:command\s+name=\"(.*?)\".*?\>/o)
               { $commands++ ;
-                $collection{"$1"} = '' } }
+                $collection{"$mappings{$1}"} = '' } }
        close(XML) ;
-       if (open(API,">$filename-scite.api"))
+       if (open(API,">cont-$interface-scite.api"))
          { foreach $name (keys %collection)
              { print API "\\$name\n" }
            print API "\n" ;
            close(API) }
-       if (open(API,">$filename-scite.properties"))
+       if (open(API,">cont-$interface-scite.properties"))
          { my $i = 0 ;
-           my $interface = 'en' ;
-           if ($filename =~ /cont\-(..)/o)
-             { $interface = $1 }
            print API "keywordclass.macros.context.$interface=" ;
            foreach $name (keys %collection)
              { if ($i==0)
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 7938ebe07..e774c83a8 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2004.11.22}
+\def\contextversion{2004.11.23}
 
 %D Welcome to the main module. When this module is ran through
 %D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex
index 42dd5ac40..a8d8f9fc5 100644
--- a/tex/context/base/core-con.tex
+++ b/tex/context/base/core-con.tex
@@ -219,7 +219,7 @@
 \def\defineconversionvector#1#2% name base
   {\bgroup
    % dirty trick
-   \uccode`\!=`\1
+   \uccode`\*=`\1
    % plain:
    % \uccode`\0=\numexpr#2+0\relax \uccode`\1=\numexpr#2+1\relax
    % \uccode`\2=\numexpr#2+2\relax \uccode`\3=\numexpr#2+3\relax
@@ -229,8 +229,8 @@
    % context:
    \dostepwiserecurse091{\expandafter\uccode\expandafter`\recurselevel=\numexpr#2+\recurselevel}%
    % prepared macro
-   \uppercase\expandafter{\expandafter\gdef\csname::cvn::#1::\endcsname##!%
-     {\ifcase##! 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}}%
+   \uppercase\expandafter{\expandafter\gdef\csname::cvn::#1::\endcsname##*%
+     {\ifcase##* 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}}%
    \egroup}
 
 \def\conversionnumber#1#2%
diff --git a/tex/context/base/lang-alt.tex b/tex/context/base/lang-alt.tex
index 3dff97407..d59df78bd 100644
--- a/tex/context/base/lang-alt.tex
+++ b/tex/context/base/lang-alt.tex
@@ -87,8 +87,6 @@
 \setuplabeltext [\s!tr]    [\v!friday=cuma]
 \setuplabeltext [\s!tr]  [\v!saturday=cumartesi]
 
-%D \ShowAllLanguageValues [\s!tr] [turkish] turks fruit
+%D \ShowAllLanguageValues [\s!tr] [turkish] {Turkish} {delight} % turks fruit
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/lang-cyr.tex b/tex/context/base/lang-cyr.tex
index 37156e706..34b5e78c3 100644
--- a/tex/context/base/lang-cyr.tex
+++ b/tex/context/base/lang-cyr.tex
@@ -362,4 +362,8 @@
 \setuplabeltext [\s!ua]  [\v!saturday=\cyrillics \cyrillicu \cyrillicb
                                       \cyrillico \cyrillict \cyrillica]
 
+
+%D \ShowAllLanguageValues [\s!ru] [russian]  {Russian}  {doll}
+%D \ShowAllLanguageValues [\s!ua] [ukranian] {Ukranian} {dance}
+
 \protect \endinput
diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex
index 03ff0c123..509dbafd5 100644
--- a/tex/context/base/lang-ger.tex
+++ b/tex/context/base/lang-ger.tex
@@ -685,12 +685,12 @@
 \def\nlordinaldaynumber#1%
   {#1\highordinalstr{e}}
 
-%D \ShowAllLanguageValues [\s!en] [english]   engelse humor
-%D \ShowAllLanguageValues [\s!nl] [dutch]     nederlandse zuinigheid
-%D \ShowAllLanguageValues [\s!de] [german]    duitse degelijkheid
-%D \ShowAllLanguageValues [\s!da] [danish]    deense ...
-%D \ShowAllLanguageValues [\s!sv] [swedish]   zweedse ...
-%D \ShowAllLanguageValues [\s!af] [afrikaans] afrikaanse gasvryheid
-%D \ShowAllLanguageValues [\s!no] [norwegian] noorse ...
+%D \ShowAllLanguageValues [\s!en] [english]   {English}    {horn}    % engelse humor
+%D \ShowAllLanguageValues [\s!nl] [dutch]     {Dutch}      {treat}   % nederlandse zuinigheid
+%D \ShowAllLanguageValues [\s!de] [german]    {German}     {beer}    % duitse degelijkheid
+%D \ShowAllLanguageValues [\s!da] [danish]    {Danish}     {pastry}
+%D \ShowAllLanguageValues [\s!sv] [swedish]   {Swedish}    {design}
+%D \ShowAllLanguageValues [\s!af] [afrikaans] {Afrikaaner} {boer}    % afrikaanse gasvryheid
+%D \ShowAllLanguageValues [\s!no] [norwegian] {Norwegian}  {wood}
 
 \protect \endinput
diff --git a/tex/context/base/lang-grk.tex b/tex/context/base/lang-grk.tex
index 9e9223adc..fe968be17 100644
--- a/tex/context/base/lang-grk.tex
+++ b/tex/context/base/lang-grk.tex
@@ -81,6 +81,6 @@
 \setuplabeltext [\s!gr]          [\v!friday=\GreekPi\Greekalpha\Greekrho\Greekalpha\Greeksigma\Greekkappa\Greekepsilon\Greekupsilon\Greeketatonos]
 \setuplabeltext [\s!gr]        [\v!saturday=\GreekSigma\Greekalphatonos\Greekbeta\Greekbeta\Greekalpha\Greektau\Greekomicron]
 
-%D % \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos] Greek ...
+%D % \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos] {Greek} {love}
 
 \protect \endinput
diff --git a/tex/context/base/lang-ind.tex b/tex/context/base/lang-ind.tex
index 7796bcb2a..9cc6623cf 100644
--- a/tex/context/base/lang-ind.tex
+++ b/tex/context/base/lang-ind.tex
@@ -23,6 +23,4 @@
 
 \unprotect
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex
index 6db5bf54c..69c01a3da 100644
--- a/tex/context/base/lang-ita.tex
+++ b/tex/context/base/lang-ita.tex
@@ -509,12 +509,12 @@
 
 \defineconversion [\s!fr] [\v!day+] [\frordinaldaynumber]
 
-%D \ShowAllLanguageValues [\s!fr] [french]     franse slag
-%D \ShowAllLanguageValues [\s!es] [spanish]    spaans benauwd
-%D \ShowAllLanguageValues [\s!ca] [catalan]    catalaans ...
-%D \ShowAllLanguageValues [\s!it] [italian]    italiaanse ...
-%D \ShowAllLanguageValues [\s!la] [latin]      latijnse missen
-%D \ShowAllLanguageValues [\s!pt] [portuguese] portugese ...
-%D \ShowAllLanguageValues [\s!ro] [romanian]   romanian ...
+%D \ShowAllLanguageValues [\s!fr] [french]     {French}     {kiss}        % franse slag
+%D \ShowAllLanguageValues [\s!es] [spanish]    {Spanish}    {guitar}      % spaans benauwd
+%D \ShowAllLanguageValues [\s!ca] [catalan]    {Catalan}    {cream}
+%D \ShowAllLanguageValues [\s!it] [italian]    {Italian}    {aria}
+%D \ShowAllLanguageValues [\s!la] [latin]      {Latin}      {lover}       % latijnse missen
+%D \ShowAllLanguageValues [\s!pt] [portuguese] {Portuguese} {fisherman}
+%D \ShowAllLanguageValues [\s!ro] [romanian]   {Romanian}   {traveller}
 
 \protect \endinput
diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex
index 77b6e879b..41a91763d 100644
--- a/tex/context/base/lang-sla.tex
+++ b/tex/context/base/lang-sla.tex
@@ -439,10 +439,10 @@
 \setuplabeltext [\s!sl] [\v!hereafter=glej spodaj]
 \setuplabeltext [\s!sl]       [\v!see=glej ]
 
-%D \ShowAllLanguageValues [\s!pl] [polish] poolse ...
-%D \ShowAllLanguageValues [\s!cz] [czech]  tsjechische ...
-%D \ShowAllLanguageValues [\s!sk] [slovak] slovaakse ...
-%D \ShowAllLanguageValues [\s!hr] [croatian] croatian ...
-%D \ShowAllLanguageValues [\s!sl] [slovenian] slovenian ...
+%D \ShowAllLanguageValues [\s!pl] [polish]    {Polish}    {furniture}
+%D \ShowAllLanguageValues [\s!cz] [czech]     {Czech}     {mate}
+%D \ShowAllLanguageValues [\s!sk] [slovak]    {Slovakian} {face}
+%D \ShowAllLanguageValues [\s!hr] [croatian]  {Croatian}  {heartthrob}
+%D \ShowAllLanguageValues [\s!sl] [slovenian] {Slovenian} {mountains}
 
 \protect \endinput
diff --git a/tex/context/base/lang-ura.tex b/tex/context/base/lang-ura.tex
index 3e77c7a22..2ecb31e6b 100644
--- a/tex/context/base/lang-ura.tex
+++ b/tex/context/base/lang-ura.tex
@@ -154,7 +154,7 @@
 \setuplabeltext [\s!hu]    [\v!friday=p\'entek]
 \setuplabeltext [\s!hu]  [\v!saturday=szombat]
 
-%D \ShowAllLanguageValues [\s!fi] [finnish] finse ...
-%D \ShowAllLanguageValues [\s!hu] [hungarian] magyar ...
+%D \ShowAllLanguageValues [\s!fi] [finnish]   {Finnish}   {phone}
+%D \ShowAllLanguageValues [\s!hu] [hungarian] {Hungarian} {rhapsody}
 
 \protect \endinput
diff --git a/tex/context/base/lang-vn.tex b/tex/context/base/lang-vn.tex
index c01e56d82..cf8536e70 100644
--- a/tex/context/base/lang-vn.tex
+++ b/tex/context/base/lang-vn.tex
@@ -38,7 +38,7 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve  m },yy},
+   \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve m },yy},
    \c!state=\v!stop]
 
 \installlanguage [vietnamese] [\s!vn]
@@ -46,46 +46,48 @@
 \setupheadtext [\s!vn] [\v!content=M\udotbelow c l\udotbelow c]
 \setupheadtext [\s!vn] [\v!tables=Danh s\aacute ch b\ahook ng]
 \setupheadtext [\s!vn] [\v!figures=Danh s\aacute ch h\igrave nh v\etilde]
-\setupheadtext [\s!vn] [\v!graphics=Graphics]
+\setupheadtext [\s!vn] [\v!graphics=\Dstroke\ocircumflexgrave\ th\idotbelow] % D
 \setupheadtext [\s!vn] [\v!intermezzi=Intermezzos]
 \setupheadtext [\s!vn] [\v!index=Ch\ihook\ s\ocircumflexacute]
-\setupheadtext [\s!vn] [\v!abbreviations=Abbreviations]
-\setupheadtext [\s!vn] [\v!logos=Logos]
-\setupheadtext [\s!vn] [\v!units=Units]
+\setupheadtext [\s!vn] [\v!abbreviations=Ch\uhorntilde\ vi\ecircumflexacute t t\abreveacute t]
+\setupheadtext [\s!vn] [\v!logos=Bi\ecircumflexhook u t\uhorn \ohorndotbelow ng]
+\setupheadtext [\s!vn] [\v!units=\Dstroke\ohorn n v\idotbelow] % D
 
 \setuplabeltext [\s!vn] [\v!table=B\ahook ng]
 \setuplabeltext [\s!vn] [\v!figure=H\igrave nh]
 \setuplabeltext [\s!vn] [\v!intermezzo=intermezzo]
-\setuplabeltext [\s!vn] [\v!graphic=graphic]
-\setuplabeltext [\s!vn] [\v!chapter=chapter]
+\setuplabeltext [\s!vn] [\v!graphic=\Dstroke\ocircumflexgrave\ th\idotbelow] % D
+\setuplabeltext [\s!vn] [\v!chapter=Ch\uhorn \ohorn ng]
 \setuplabeltext [\s!vn] [\v!section=] % not set
 \setuplabeltext [\s!vn] [\v!subsection=] % not set
 \setuplabeltext [\s!vn] [\v!subsubsection=] % not set
 \setuplabeltext [\s!vn] [\v!subsubsubsection=] % not set
 \setuplabeltext [\s!vn] [\v!appendix=] % not set
 \setuplabeltext [\s!vn] [\v!part=Ph\acircumflexgrave n ]
-\setuplabeltext [\s!vn] [\v!line=line ]
-\setuplabeltext [\s!vn] [\v!lines=lines ]
+\setuplabeltext [\s!vn] [\v!line=d\ograve ng ]
+\setuplabeltext [\s!vn] [\v!lines=d\ograve ng ]
 
-\setuplabeltext [\s!vn]    [\v!sunday=Sunday]
-\setuplabeltext [\s!vn]    [\v!monday=Monday]
-\setuplabeltext [\s!vn]   [\v!tuesday=Tuesday]
-\setuplabeltext [\s!vn] [\v!wednesday=Wednesday]
-\setuplabeltext [\s!vn]  [\v!thursday=Thursday]
-\setuplabeltext [\s!vn]    [\v!friday=Friday]
-\setuplabeltext [\s!vn]  [\v!saturday=Saturday]
+\setuplabeltext [\s!vn] [\v!sunday=ch\uhook\ nh\acircumflexdotbelow t]
+\setuplabeltext [\s!vn] [\v!monday=th\uhornacute\ hai]
+\setuplabeltext [\s!vn] [\v!tuesday=th\uhornacute\ ba]
+\setuplabeltext [\s!vn] [\v!wednesday=th\uhornacute\ t\uhorn]
+\setuplabeltext [\s!vn] [\v!thursday=th\uhornacute\ n\abreve m]
+\setuplabeltext [\s!vn] [\v!friday=th\uhornacute\ s\aacute u]
+\setuplabeltext [\s!vn] [\v!saturday=th\uhornacute\ b\ahook y]
 
-\setuplabeltext [\s!vn]   [\v!january=gi\ecircumflex ng]
-\setuplabeltext [\s!vn]  [\v!february=hai]
-\setuplabeltext [\s!vn]     [\v!march=ba]
-\setuplabeltext [\s!vn]     [\v!april=t\uhorn]
-\setuplabeltext [\s!vn]       [\v!may=n\abreve m]
-\setuplabeltext [\s!vn]      [\v!june=s\aacute u]
-\setuplabeltext [\s!vn]      [\v!july=b\ahook y]
-\setuplabeltext [\s!vn]    [\v!august=t\aacute m]
-\setuplabeltext [\s!vn] [\v!september=ch\iacute n]
-\setuplabeltext [\s!vn]   [\v!october=m\uhorn\ohorngrave i]
-\setuplabeltext [\s!vn]  [\v!november=m\uhorn\ohorngrave i m\ocircumflexdotbelow t]
-\setuplabeltext [\s!vn]  [\v!december=m\uhorn\ohorngrave i hai]
+\setuplabeltext [\s!vn] [\v!january=th\aacute ng gi\ecircumflex ng]
+\setuplabeltext [\s!vn] [\v!february=th\aacute ng hai]
+\setuplabeltext [\s!vn] [\v!march=th\aacute ng ba]
+\setuplabeltext [\s!vn] [\v!april=th\aacute ng t\uhorn]
+\setuplabeltext [\s!vn] [\v!may=th\aacute ng n\abreve m]
+\setuplabeltext [\s!vn] [\v!june=th\aacute ng s\aacute u]
+\setuplabeltext [\s!vn] [\v!july=th\aacute ng b\ahook y]
+\setuplabeltext [\s!vn] [\v!august=th\aacute ng t\aacute m]
+\setuplabeltext [\s!vn] [\v!september=th\aacute ng ch\iacute n]
+\setuplabeltext [\s!vn] [\v!october=th\aacute ng m\uhorn\ohorngrave i]
+\setuplabeltext [\s!vn] [\v!november=th\aacute ng m\uhorn\ohorngrave i m\ocircumflexdotbelow t]
+\setuplabeltext [\s!vn] [\v!december=th\aacute ng m\uhorn\ohorngrave i hai]
+
+%D \ShowAllLanguageValues [\s!vn] [vietnamese] {Vietnamese} {water||puppets}
 
 \protect \endinput
diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex
index cdf95cb7a..fda87f691 100644
--- a/tex/context/base/page-set.tex
+++ b/tex/context/base/page-set.tex
@@ -67,11 +67,11 @@
 % The following two macros are used to compensate for a switch in body fonts
 % as in:
 %
-% \definecolumnset [twee]  [n=2,balanceren=ja]
-% \definecolumnset [three] [n=3,balanceren=ja]
+% \definecolumnset [two]  [n=2,balancing=yes]
+% \definecolumnset [three] [n=3,balancing=yes]
 %
-% \setupcolumnsetlines[twee][1][1][7]
-% \setupcolumnsetlines[twee][1][2][10]
+% \setupcolumnsetlines[two][1][1][7]
+% \setupcolumnsetlines[two][1][2][10]
 %
 % \setupcolumnsetlines[three][1][1][40]
 % \setupcolumnsetlines[three][1][2][40]
@@ -82,8 +82,8 @@
 % \setupcolumnsetstart[three][1][3][20]
 %
 % \starttext
-%   \startcolumnset [twee] \dorecurse {1}{\input tufte \par} \stopcolumnset
-%   \switchnaarkorps[klein]
+%   \startcolumnset [two] \dorecurse {1}{\input tufte \par} \stopcolumnset
+%   \switchtobodyfont[small]
 %   \startcolumnset [three] \dorecurse {1}{\input tufte \par} \stopcolumnset
 % \stoptext
 
@@ -1618,11 +1618,11 @@
 \def\doOTRSETgotocolumn[#1]% yes|force|first|last|<number>|<number>*<number>
   {\processallactionsinset
      [#1]
-     [     \v!yes=>\OTRSETdummycolumn,
-          \v!no=>,% not supported
-      \v!force=>\OTRSETdummycolumn,
-       \v!first=>\expanded{\doOTRSETgotoCOLUMN{1}},
-      \v!last=>\expanded{\doOTRSETgotoCOLUMN{\the\nofcolumns}},
+     [    \v!yes=>\OTRSETdummycolumn,
+           \v!no=>,% not supported
+        \v!force=>\OTRSETdummycolumn,
+        \v!first=>\expanded{\doOTRSETgotoCOLUMN{1}},
+         \v!last=>\expanded{\doOTRSETgotoCOLUMN{\the\nofcolumns}},
       \s!default=>\OTRSETdummycolumn,
       \s!unknown=>\expanded{\doOTRSETgotoCOLROW{\commalistelement}}]}
 
@@ -1909,7 +1909,7 @@
    \processaction
      [\getvalue{\??mc\OTRSETidentifier\c!balance}]
      [    \v!yes=>\chardef\OTRSETbalancemethod\plusone,
-       \v!top=>\chardef\OTRSETbalancemethod\plustwo,
+          \v!top=>\chardef\OTRSETbalancemethod\plustwo,
        \v!bottom=>\chardef\OTRSETbalancemethod\plusthree]}
 
 % keep 'm for a while
@@ -2415,7 +2415,7 @@
         \processaction
           [\getvalue{\??mt##1#2\c!state}]
           [  \v!start=>\donetrue\doglobal\removefromcommalist{##1}#1,
-           \v!repeat=>\donetrue,
+            \v!repeat=>\donetrue,
            \s!unknown=>\doperformtest\commalistelement\donetrue\donefalse]%
         \ifdone
           \dodoplacecolumntextareas{##1}{#2}
@@ -2454,7 +2454,7 @@
      {\donetrue\localframed
         [\??mt\currentcolumntestarea]
         [\c!location=,% new (*)
-         \c!width=\!!widtha,\c!height=\!!heighta,\c!lines=]
+            \c!width=\!!widtha,\c!height=\!!heighta,\c!lines=]
         {\columntextareaparameter\empty}}%
    \!!counta\columntextareaparameter\c!x
    \!!countb\columntextareaparameter\c!y
@@ -2471,13 +2471,13 @@
         \copy\scratchbox % \box
       \else
         \clip
-          [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+          [   %\c!topoffset=\columntextareaparameter\c!clipoffset,%
            %\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!leftoffset=\columntextareaparameter\c!clipoffset,%
-           \c!offset=\columntextareaparameter\c!clipoffset,%
-           \c!rightoffset=\zeropoint,%
-           \c!width=\!!widthb,%
-           \c!height=\!!heighta]%
+             %\c!leftoffset=\columntextareaparameter\c!clipoffset,%
+                  \c!offset=\columntextareaparameter\c!clipoffset,%
+             \c!rightoffset=\zeropoint,%
+                   \c!width=\!!widthb,%
+                  \c!height=\!!heighta]%
           {\copy\scratchbox}%
       \fi}%
    \OTRSETsetgridcell\!!counta\!!countb\box0
@@ -2488,14 +2488,14 @@
      \setbox0\hbox
        {\hskip-\namedlayoutparameter\v!odd\c!backspace
         \clip
-          [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+          [   %\c!topoffset=\columntextareaparameter\c!clipoffset,%
            %\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!rightoffset=\columntextareaparameter\c!clipoffset,%
-           \c!offset=\columntextareaparameter\c!clipoffset,%
-           \c!leftoffset=\zeropoint,%
-           \c!width=\!!widtha,%
-           \c!height=\!!heighta,%
-           \c!hoffset=\!!widthb]%
+            %\c!rightoffset=\columntextareaparameter\c!clipoffset,%
+                  \c!offset=\columntextareaparameter\c!clipoffset,%
+              \c!leftoffset=\zeropoint,%
+                   \c!width=\!!widtha,%
+                  \c!height=\!!heighta,%
+                 \c!hoffset=\!!widthb]%
           {\copy\scratchbox}}%
      \OTRSETsetgridcell\!!counta\!!countb\box0%
    \fi}
@@ -2541,9 +2541,9 @@
    \ifodd\realpageno \else % tricky, assumes that we keep there
      \ifcase\!!countc\else
        % nog niet ok voor enkel/dubbelzijdig
-       \advance\!!widtha \namedlayoutparameter\v!even  \c!backspace
-       \advance\!!widtha \namedlayoutparameter\v!odd\c!backspace
-       \advance\!!widthb \namedlayoutparameter\v!even  \c!backspace
+       \advance\!!widtha \namedlayoutparameter\v!even\c!backspace
+       \advance\!!widtha \namedlayoutparameter\v!odd \c!backspace
+       \advance\!!widthb \namedlayoutparameter\v!even\c!backspace
        \dorecurse\!!countc
          {\advance\!!widtha\OTRSETgetparameter\c!distance\recurselevel}%
      \fi
diff --git a/tex/context/base/s-mod-00.tex b/tex/context/base/s-mod-00.tex
index f584a23b6..ee6b23504 100644
--- a/tex/context/base/s-mod-00.tex
+++ b/tex/context/base/s-mod-00.tex
@@ -437,7 +437,7 @@
 \stoptable
 \stopbuffer
 
-\gdef\ShowTextsValues [#1] [#2]
+\gdef\ShowTextsValues[#1][#2]%
   {\vbox\bgroup
    \language[#1]%
    \setbox\scratchbox\hbox to \hsize{\hss\bfb#2 language defaults\hss}
@@ -453,7 +453,7 @@
       $\vcenter{\getbuffer[lang-c]}$&&$\vcenter{\getbuffer[lang-d]}$\cr}%
    \egroup}
 
-\gdef\ShowLanguageValues [#1] [#2] #3 #4
+\gdef\ShowLanguageValues[#1][#2]#3#4%
   {\hbox to \hsize
      {\hss
       \vbox
@@ -464,25 +464,25 @@
         \HL
         \VL \THREE{\bf subsentence symbol and quotes} \VL\SR
         \HL
-        \VL \quotation{#3 #4} \VL \quote{#2} \VL \let|=\normalbar |<||<|#3|>|#4|>| \VL\SR
-        \VL \quotation{#3 #4} \VL \quote{#2} \VL |<||<|#3|>|#4|>| \VL\SR
+        \VL \quotation{#3 #4} \VL \quote{#2} \VL \let|=\normalbar |<||<|#3|>|#4|>| \VL\FR
+        \VL \quotation{#3 #4} \VL \quote{#2} \VL |<||<|#3|>|#4|>| \VL\LR
         \HL
         \stoptable
         \egroup
       \hss}}
 
-\gdef\doShowAllLanguageValues [#1] [#2] #3 #4
+\gdef\doShowAllLanguageValues[#1][#2]#3#4%
   {\vbox
-     {\ShowTextsValues [#1] [#2]
+     {\ShowTextsValues[#1][#2]
       \vskip2em
-      \ShowLanguageValues  [#1] [#2] #3 #4 }
+      \ShowLanguageValues[#1][#2]{#3}{#4}}
    \protect
    \page}
 
-\gdef\ShowAllLanguageValues%
+\gdef\ShowAllLanguageValues
   {\page
    \unprotect
-   \doShowAllLanguageValues}
+   \dodoubleargument\doShowAllLanguageValues}
 
 \protect
 
diff --git a/tex/context/base/spec-xtx.tex b/tex/context/base/spec-xtx.tex
index a8f0c0d48..576560203 100644
--- a/tex/context/base/spec-xtx.tex
+++ b/tex/context/base/spec-xtx.tex
@@ -149,4 +149,90 @@
 
 \stopspecials
 
+\protect
+
+%\endinput
+
+% FOR THE MOMENT HERE
+
+\ifx\dqfontquote\undefined \else \endinput \fi
+
+\unprotect
+
+% actually, we can use "" in pdftex> 1.20 as well
+
+\def\parsefontspec#1%
+  {\xdef\somefontspec{#1\space}%
+   \@EA\doparsefontspec\somefontspec\relax]% =>#1 \empty]
+   \donoparsefontspec}
+
+\def\doparsefontspec#1%
+  {\ifx"#1%
+     \@EA\dodqparsefontspec
+   \else\ifx'#1%
+     \@EAEAEA\dosqparsefontspec
+   \else
+     \@EAEAEA\dodoparsefontspec
+   \fi\fi#1}
+
+\def\dqfontquote{"}
+\def\sqfontquote{'}
+
+\def\dodqparsefontspec"#1"#2%
+  {\def\somefontname{#1}%
+   \let\somefontquote\dqfontquote
+   \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2}
+
+\def\dosqparsefontspec'#1'#2%
+  {\def\somefontname{#1}%
+   \let\somefontquote\sqfontquote
+   \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2}
+
+\def\dodoparsefontspec#1 #2%
+  {\def\somefontname{#1}%
+   \let\somefontquote\empty
+   \ifx\somefontname\empty % space before fontname
+     \@EA\doparsefontspec
+   \else\ifx#2\relax
+     \@EAEAEA\setnaturalfontspec
+   \else
+     \@EAEAEA\setforcedfontspec
+   \fi\fi
+   #2}
+
+\def\setnaturalfontspec#1]%
+  {\@fs@scaled\plusthousand\relax}
+
+\def\setforcedfontspec#1 #2\relax]%
+  {\csname\@fs@#1\endcsname#2\relax}
+
+\beginXETEX \font
+
+\def\donoparsefontspec % #1 == \cs
+  {\edef\fontfile{\somefontquote\truefontname\somefontname\somefontquote}%
+   \ifx\fontfile\s!unknown \let\fontfile\defaultfontfile \fi
+   \edef\lastfontname{\fontfile\somefontspec}%
+   \ifx\fontclass\empty
+     \expandafter\definefontlocal
+   \else
+     \expandafter\definefontglobal
+   \fi} % #1 == \cs
+
+\endXETEX
+
 \protect \endinput
+
+\starttext
+
+\definedfont[{cmr10}  at 40pt] test
+\definedfont['cmss10' at 40pt] test
+\definedfont["cmtt10" at 40pt] test
+
+\definedfont[{cmr10}  at 40pt] test
+\definedfont['cmss10' at 40pt] test
+\definedfont["cmtt10" at 40pt] test
+
+% \definedfont["Gentium" at 40pt] test
+
+\stoptext
+
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index b29c2e64e..904c6147b 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index b3f772a1a..e3d111047 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index a736cfceb..98243d440 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 3827e7126..74ba49bc9 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 851c11888..ef36320a2 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 90d7c10ba..7b46a9642 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.23">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>